diff --git a/debian/changelog b/debian/changelog index 2b4f9f6a..10f4b113 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -hedera-web (1.391-deb8) stable; urgency=low +hedera-web (1.392-deb8) stable; urgency=low * Initial Release. diff --git a/image/logo.png b/image/logo.png new file mode 100644 index 00000000..55e26fec Binary files /dev/null and b/image/logo.png differ diff --git a/rest/core/recover-password.php b/rest/core/recover-password.php index 876a110c..9c2c2307 100755 --- a/rest/core/recover-password.php +++ b/rest/core/recover-password.php @@ -4,7 +4,7 @@ use Vn\Web; class RecoverPassword extends Vn\Web\JsonRequest { - const PARAMS = ['user']; + const PARAMS = ['recoverUser']; function run ($db) { @@ -13,14 +13,14 @@ class RecoverPassword extends Vn\Web\JsonRequest FROM vn2008.Clientes c JOIN account.user u ON u.id = c.Id_Cliente WHERE u.name = #', - [$_REQUEST['user']] + [$_REQUEST['recoverUser']] ); if (!($user['active'] && $user['mail'])) return TRUE; $service = $this->service; - $token = $service->createToken ($_REQUEST['user'], FALSE, TRUE); + $token = $service->createToken ($_REQUEST['recoverUser'], FALSE, TRUE); $url = $service->getUrl () ."#!form=account/conf&token=$token"; $report = new Vn\Web\Report ($db, 'recover-password', ['url' => $url]); diff --git a/webpack.config.js b/webpack.config.js index a6168619..a408ead8 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -13,19 +13,20 @@ var config = { publicPath: 'build/' }, module: { - loaders: [ - { test: /\.css$/, loader: 'style!css' }, - { test: /\.json$/, loader: 'json' }, - { test: /\.xml$/, loader: 'raw' }, - { test: /\.ttf$/, loader: 'file' } + rules: [ + { test: /\.css$/, loader: 'style-loader!css-loader' }, + { test: /\.json$/, loader: 'json-loader' }, + { test: /\.xml$/, loader: 'raw-loader' }, + { test: /\.ttf$/, loader: 'file-loader' } ] }, resolve: { - modulesDirectories: [__dirname +'/js', __dirname, 'node_modules'], - fallback: process.env.NODE_PATH, - }, - resolveLoader: { - fallback: process.env.NODE_PATH + modules: [ + __dirname +'/js', + __dirname, + 'node_modules', + '/usr/lib/node_modules' + ] }, plugins: [ new webpack.DefinePlugin ({ _DEV_MODE: devMode })