From 94e1f6a79cc80b8b090753947db5fde90a48c233 Mon Sep 17 00:00:00 2001 From: Muthu Kumar Date: Wed, 20 Mar 2019 00:03:48 +0530 Subject: [PATCH] [fix] Load plugins before app --- .eslintrc.js | 28 ---------------------------- php.ini | 22 +++++++++++----------- plugins/loader.js | 8 +++----- plugins/nextcloud-md.js | 1 + server.js | 4 ++-- 5 files changed, 17 insertions(+), 46 deletions(-) delete mode 100644 .eslintrc.js create mode 100644 plugins/nextcloud-md.js diff --git a/.eslintrc.js b/.eslintrc.js deleted file mode 100644 index a27b44f..0000000 --- a/.eslintrc.js +++ /dev/null @@ -1,28 +0,0 @@ -module.exports = { - "env": { - "es6": true, - "node": true - }, - "extends": "eslint:recommended", - "rules": { - "no-console": "off", - "no-var": "error", - "prefer-const": [ - "error", { - "destructuring": "all" - }], - "indent": [ - "error", - "tab" - ], - "linebreak-style": [ - "error", - "unix" - ], - "quotes": "off", - "semi": [ - "error", - "never" - ] - } -}; \ No newline at end of file diff --git a/php.ini b/php.ini index 1cf2a41..e5302f1 100644 --- a/php.ini +++ b/php.ini @@ -747,7 +747,7 @@ user_dir = ; Directory in which the loadable extensions (modules) reside. ; http://php.net/extension-dir -;extension_dir = "./" +extension_dir = "./ext" ; On windows: ;extension_dir = "ext" @@ -901,18 +901,18 @@ default_socket_timeout = 60 ; extension folders as well as the separate PECL DLL download (PHP 5+). ; Be sure to appropriately set the extension_dir directive. ; -;extension=bz2 -;extension=curl -;extension=fileinfo -;extension=gd2 +extension=bz2 +extension=curl +extension=fileinfo +extension=gd2 ;extension=gettext -;extension=gmp +extension=gmp ;extension=intl -;extension=imap +extension=imap ;extension=interbase ;extension=ldap -;extension=mbstring -;extension=exif ; Must be after mbstring as it depends on it +extension=mbstring +extension=exif ; Must be after mbstring as it depends on it ;extension=mysqli ;extension=oci8_12c ; Use with Oracle Database 12c Instant Client ;extension=odbc @@ -922,7 +922,7 @@ default_socket_timeout = 60 ;extension=pdo_oci ;extension=pdo_odbc ;extension=pdo_pgsql -;extension=pdo_sqlite +extension=pdo_sqlite ;extension=pgsql ;extension=shmop @@ -933,7 +933,7 @@ default_socket_timeout = 60 ;extension=soap ;extension=sockets ;extension=sodium -;extension=sqlite3 +extension=sqlite3 ;extension=tidy ;extension=xmlrpc ;extension=xsl diff --git a/plugins/loader.js b/plugins/loader.js index 8742b20..8b98dfd 100644 --- a/plugins/loader.js +++ b/plugins/loader.js @@ -1,12 +1,10 @@ -'use strict' - -const { EOL } = require('os'); +'use strict'; function plugins(app) { - const { plugins } = require('../config') + const { plugins = [] } = require('../config'); return plugins.map(plugin => { require('../plugins/' + plugin)(app); - console.log(EOL + 'Loaded plugin ' + plugin + '...'); + console.log('Loaded plugin ' + plugin + '...'); }); }; diff --git a/plugins/nextcloud-md.js b/plugins/nextcloud-md.js new file mode 100644 index 0000000..be1ecec --- /dev/null +++ b/plugins/nextcloud-md.js @@ -0,0 +1 @@ +module.exports = app => app.use((req, res, next) => res.redirect('/index.php' + req.originalUrl)); \ No newline at end of file diff --git a/server.js b/server.js index 1495865..f03bb0b 100644 --- a/server.js +++ b/server.js @@ -12,10 +12,10 @@ const plugins = require('./plugins/loader'); const app = express(); -app.use("/", php.cgi(config)); - plugins(app); // Load any plugins declared in config +app.use("/", php.cgi(config)); + const fancy = fs.readFileSync('./fancy.txt'); const listeningMsg = ( chalk.yellow(fancy) + EOL +