wbuezas
/
hedera-web-mindshore
forked from verdnatura/hedera-web
0
1
Fork 0
Code Pull Requests Activity

Merge branch 'test' into 3971-modernizeStyle

This commit is contained in:
Juan Ferrer 2022-05-21 23:26:34 +02:00
parent 39e41a8cbd 3384170793
commit 83ab901da6
6 changed files with 7985 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
debian/changelog vendored
View File

@ -1,4 +1,4 @@
hedera-web (1.407.68) stable; urgency=low
hedera-web (1.407.69) stable; urgency=low
* Initial Release.

2
forms/ecomerce/invoices/invoices.js
View File

@ -9,7 +9,7 @@ Hedera.Invoices = new Class({
var params = {
srv: 'rest:dms/invoice',
invoice: invoiceId,
token: this.conn.token
access_token: this.conn.token
};
Object.assign(column, {

7998
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

2
package.json
View File

@ -1,6 +1,6 @@
{
"name": "hedera-web",
"version": "1.407.68",
"version": "1.407.69",
"description": "Verdnatura web page",
"license": "GPL-3.0",
"repository": {

2
web/rest-service.php
View File

@ -81,7 +81,7 @@ class RestService extends Service {
http_response_code($status);
}
function errorHandler($errno, $message, $file, $line, $context) {
function errorHandler($errno, $message, $file, $line, $context = NULL) {
$eFlag =
E_USER_NOTICE
| E_USER_WARNING

10
web/service.php
View File

@ -138,13 +138,19 @@ abstract class Service {
function login() {
$db = $this->db;
$anonymousUser = TRUE;
$token = NULL;
if (!empty($_SERVER['HTTP_AUTHORIZATION'])) {
if (!empty($_SERVER['HTTP_AUTHORIZATION']))
$token = $_SERVER['HTTP_AUTHORIZATION'];
if (!empty($_GET['access_token']))
$token = $_GET['access_token'];
if (isset($token)) {
$userId = $db->getValue(
'SELECT userId FROM salix.AccessToken
WHERE id = #
AND NOW() <= TIMESTAMPADD(SECOND, ttl, created)',
[$_SERVER['HTTP_AUTHORIZATION']]
[$token]
);
if (!$userId)