diff --git a/conf/apache.conf b/conf/apache.conf index 7bd45de6..06e66a4e 100644 --- a/conf/apache.conf +++ b/conf/apache.conf @@ -16,13 +16,26 @@ - Header set Access-Control-Allow-Origin "*" + Header set Access-Control-Allow-Origin "*" - Options Indexes FollowSymLinks MultiViews - AllowOverride FileInfo Options + Options +Indexes +FollowSymLinks Require all granted + + + Options -Indexes -MultiViews +FollowSymLinks + AllowOverride FileInfo Options + Require all granted + + + RewriteEngine On + RewriteBase / + RewriteCond %{REQUEST_FILENAME} !-d + RewriteCond %{REQUEST_FILENAME}\.png -f + RewriteRule ^(.+)$ %{REQUEST_URI}.png [L] + + diff --git a/debian/changelog b/debian/changelog index 35b80af5..10881d7f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -hedera-web (1.405.87) stable; urgency=low +hedera-web (1.405.88) stable; urgency=low * Initial Release. diff --git a/package.json b/package.json index e0bcdb45..de5f159e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "hedera-web", - "version": "1.405.87", + "version": "1.405.88", "description": "Verdnatura web page", "license": "GPL-3.0", "repository": { diff --git a/rest/image/resize.php b/rest/image/resize.php index 2f7f4940..6bca0ba1 100644 --- a/rest/image/resize.php +++ b/rest/image/resize.php @@ -10,7 +10,7 @@ require_once (__DIR__.'/lib.php'); * @param integer $maxHeight The maximum height of resized image in pixels * @param integer $maxWidth The maximum width of resized image in pixels * @param boolean $rewrite Wether to rewrite the destination file if it exits - **/ + */ class Resize extends Vn\Lib\Method { const PARAMS = [ @@ -25,7 +25,6 @@ class Resize extends Vn\Lib\Method function run () { - $options = getopt ('', $params); if (!$this->checkParams ($options, self::PARAMS)) diff --git a/rest/image/sync.php b/rest/image/sync.php index 9ffeec70..23b620d6 100644 --- a/rest/image/sync.php +++ b/rest/image/sync.php @@ -18,18 +18,18 @@ class Sync extends Vn\Lib\Method $this->dataDir = $this->util->dataDir; } - function run () + function run ($db) { $db = $this->getSysConn (); set_time_limit (0); - $this->$trashSubdir = date ('YmdHis'); + $this->trashSubdir = date ('YmdHis'); $checkCount = 0; $query = 'SELECT DISTINCT `%3$s` FROM `%1$s`.`%2$s` WHERE `%3$s` IS NOT NULL AND `%3$s` != \'\''; - $dir = opendir ("{$this->dataDir}"); + $dir = opendir ($this->dataDir); if ($dir) while ($schema = readdir ($dir)) diff --git a/rest/image/util.php b/rest/image/util.php index 5a3cd615..a3d2de2b 100644 --- a/rest/image/util.php +++ b/rest/image/util.php @@ -4,7 +4,7 @@ require_once (__DIR__.'/image.php'); /** * Base class for image methods. - **/ + */ class Util { var $app; @@ -20,7 +20,7 @@ class Util * Loads information for specified schema. * * @param string $schema The schema name - **/ + */ function loadInfo ($schema) { $db = $this->app->getSysConn ();