From 51ba514d2a6ee9792d6416902b68d94a4003539f Mon Sep 17 00:00:00 2001
From: slawkens1 <slawkens@gmail.com>
Date: Fri, 29 Dec 2017 11:07:43 +0100
Subject: [PATCH] * update to 0.7.5-dev
* fixed faq containing html code
* update item_images_url config to 1092
* added ttf, woff and ico to the list of ignored files
* fixed infinite loop in init.php
---
common.php | 2 +-
config.php | 2 +-
index.php | 2 +-
system/init.php | 3 +--
system/templates/faq.html.twig | 4 ++--
5 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/common.php b/common.php
index 12772148..5b83224e 100644
--- a/common.php
+++ b/common.php
@@ -26,7 +26,7 @@
session_start();
define('MYAAC', true);
-define('MYAAC_VERSION', '0.7.4');
+define('MYAAC_VERSION', '0.7.5-dev');
define('DATABASE_VERSION', 20);
define('TABLE_PREFIX', 'myaac_');
define('START_TIME', microtime(true));
diff --git a/config.php b/config.php
index c51a77a8..d1e53bbd 100644
--- a/config.php
+++ b/config.php
@@ -75,7 +75,7 @@ $config = array(
// images
'outfit_images_url' => 'http://outfit-images.ots.me/outfit.php', // set to animoutfit.php for animated outfit
- 'item_images_url' => 'http://item-images.ots.me/960/', // set to images/items if you host your own items in images folder
+ 'item_images_url' => 'http://item-images.ots.me/1092/', // set to images/items if you host your own items in images folder
// account
'account_management' => true, // disable if you're using other method to manage users (fe. tfs account manager)
diff --git a/index.php b/index.php
index fee0c8e7..961b4934 100644
--- a/index.php
+++ b/index.php
@@ -51,7 +51,7 @@ if(preg_match("/^[A-Za-z0-9-_%\'+]+\.png$/i", $uri)) {
include(TOOLS . 'signature/index.php');
exit();
}
-else if(preg_match("/^(.*)\.(gif|jpg|png|jpeg|tiff|bmp|css|js|less|map|html|php|zip|rar|gz)$/i", $_SERVER['REQUEST_URI'])) {
+else if(preg_match("/^(.*)\.(gif|jpg|png|jpeg|tiff|bmp|css|js|less|map|html|php|zip|rar|gz|ttf|woff|ico)$/i", $_SERVER['REQUEST_URI'])) {
header("HTTP/1.0 404 Not Found");
exit;
}
diff --git a/system/init.php b/system/init.php
index 938a43fa..8833b95a 100644
--- a/system/init.php
+++ b/system/init.php
@@ -14,8 +14,7 @@ if(file_exists(BASE . 'config.local.php')) // user customizations
require(BASE . 'config.local.php');
if(!isset($config['installed']) || !$config['installed']) {
- header('Location: ' . BASE_URL);
- die('AAC has not been installed yet or there was error during installation. Please install again.');
+ die('MyAAC has not been installed yet or there was error during installation. Please install again.');
}
date_default_timezone_set($config['date_timezone']);
diff --git a/system/templates/faq.html.twig b/system/templates/faq.html.twig
index 1d7b9283..c6ff405e 100644
--- a/system/templates/faq.html.twig
+++ b/system/templates/faq.html.twig
@@ -17,9 +17,9 @@
{% set i = i + 1 %}
<tr bgcolor="{{ getStyle(i) }}">
<td colspan="2" style="cursor: pointer;" onclick="toggleVisibility('faq_{{ i }}'); return false;">
- <b>{{ faq.question }}</b>
+ <b>{{ faq.question|raw }}</b>
- <div id="faq_{{ i }}" style="display: none;">{{ faq.answer }}</div>
+ <div id="faq_{{ i }}" style="display: none;">{{ faq.answer|raw }}</div>
</td>
{% if canEdit %}
<td>