From 82b41d4df5b659bc182cdce0b07ef159fa92eb54 Mon Sep 17 00:00:00 2001 From: slawkens Date: Wed, 22 Dec 2021 07:03:05 +0100 Subject: [PATCH 1/6] Add browsehappy code --- system/functions.php | 5 ++++- system/templates/browsehappy.html.twig | 3 +++ 2 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 system/templates/browsehappy.html.twig diff --git a/system/functions.php b/system/functions.php index fee72b27..b73868f6 100644 --- a/system/functions.php +++ b/system/functions.php @@ -462,7 +462,7 @@ function tickers() */ function template_place_holder($type) { - global $template_place_holders; + global $twig, $template_place_holders; $ret = ''; if(array_key_exists($type, $template_place_holders) && is_array($template_place_holders[$type])) @@ -471,6 +471,9 @@ function template_place_holder($type) if($type === 'head_start') { $ret .= template_header(); } + elseif ($type === 'body_start') { + $ret .= $twig->render('browsehappy.html.twig'); + } elseif($type === 'body_end') { $ret .= template_ga_code(); } diff --git a/system/templates/browsehappy.html.twig b/system/templates/browsehappy.html.twig new file mode 100644 index 00000000..57c2a0d8 --- /dev/null +++ b/system/templates/browsehappy.html.twig @@ -0,0 +1,3 @@ + From fa7c6497e6a1d97b778a3cdd7f4c71ce2977b5c3 Mon Sep 17 00:00:00 2001 From: slawkens Date: Mon, 27 Dec 2021 21:21:24 +0100 Subject: [PATCH 2/6] Replace define with const --- common.php | 94 +++++++++++++++++++++++++++--------------------------- 1 file changed, 47 insertions(+), 47 deletions(-) diff --git a/common.php b/common.php index ea0b2bc9..337b4b5e 100644 --- a/common.php +++ b/common.php @@ -26,66 +26,66 @@ if (version_compare(phpversion(), '7.1', '<')) die('PHP version 7.1 or higher is required.'); session_start(); -define('MYAAC', true); -define('MYAAC_VERSION', '0.9.0-dev'); -define('DATABASE_VERSION', 32); -define('TABLE_PREFIX', 'myaac_'); +const MYAAC = true; +const MYAAC_VERSION = '0.9.0-dev'; +const DATABASE_VERSION = 32; +const TABLE_PREFIX = 'myaac_'; define('START_TIME', microtime(true)); define('MYAAC_OS', stripos(PHP_OS, 'WIN') === 0 ? 'WINDOWS' : (strtoupper(PHP_OS) === 'DARWIN' ? 'MAC' : 'LINUX')); define('IS_CLI', in_array(php_sapi_name(), ['cli', 'phpdb'])); // account flags -define('FLAG_ADMIN', 1); -define('FLAG_SUPER_ADMIN', 2); -define('FLAG_CONTENT_PAGES', 4); -define('FLAG_CONTENT_MAILER', 8); -define('FLAG_CONTENT_NEWS', 16); -define('FLAG_CONTENT_FORUM', 32); -define('FLAG_CONTENT_COMMANDS', 64); -define('FLAG_CONTENT_SPELLS', 128); -define('FLAG_CONTENT_MONSTERS', 256); -define('FLAG_CONTENT_GALLERY', 512); -define('FLAG_CONTENT_VIDEOS', 1024); -define('FLAG_CONTENT_FAQ', 2048); -define('FLAG_CONTENT_MENUS', 4096); -define('FLAG_CONTENT_PLAYERS', 8192); +const FLAG_ADMIN = 1; +const FLAG_SUPER_ADMIN = 2; +const FLAG_CONTENT_PAGES = 4; +const FLAG_CONTENT_MAILER = 8; +const FLAG_CONTENT_NEWS = 16; +const FLAG_CONTENT_FORUM = 32; +const FLAG_CONTENT_COMMANDS = 64; +const FLAG_CONTENT_SPELLS = 128; +const FLAG_CONTENT_MONSTERS = 256; +const FLAG_CONTENT_GALLERY = 512; +const FLAG_CONTENT_VIDEOS = 1024; +const FLAG_CONTENT_FAQ = 2048; +const FLAG_CONTENT_MENUS = 4096; +const FLAG_CONTENT_PLAYERS = 8192; // news -define('NEWS', 1); -define('TICKER', 2); -define('ARTICLE', 3); +const NEWS = 1; +const TICKER = 2; +const ARTICLE = 3; // directories -define('BASE', __DIR__ . '/'); -define('ADMIN', BASE . 'admin/'); -define('SYSTEM', BASE . 'system/'); -define('CACHE', SYSTEM . 'cache/'); -define('LOCALE', SYSTEM . 'locale/'); -define('LIBS', SYSTEM . 'libs/'); -define('LOGS', SYSTEM . 'logs/'); -define('PAGES', SYSTEM . 'pages/'); -define('PLUGINS', BASE . 'plugins/'); -define('TEMPLATES', BASE . 'templates/'); -define('TOOLS', BASE . 'tools/'); -define('VENDOR', BASE . 'vendor/'); +const BASE = __DIR__ . '/'; +const ADMIN = BASE . 'admin/'; +const SYSTEM = BASE . 'system/'; +const CACHE = SYSTEM . 'cache/'; +const LOCALE = SYSTEM . 'locale/'; +const LIBS = SYSTEM . 'libs/'; +const LOGS = SYSTEM . 'logs/'; +const PAGES = SYSTEM . 'pages/'; +const PLUGINS = BASE . 'plugins/'; +const TEMPLATES = BASE . 'templates/'; +const TOOLS = BASE . 'tools/'; +const VENDOR = BASE . 'vendor/'; // menu categories -define('MENU_CATEGORY_NEWS', 1); -define('MENU_CATEGORY_ACCOUNT', 2); -define('MENU_CATEGORY_COMMUNITY', 3); -define('MENU_CATEGORY_FORUM', 4); -define('MENU_CATEGORY_LIBRARY', 5); -define('MENU_CATEGORY_SHOP', 6); +const MENU_CATEGORY_NEWS = 1; +const MENU_CATEGORY_ACCOUNT = 2; +const MENU_CATEGORY_COMMUNITY = 3; +const MENU_CATEGORY_FORUM = 4; +const MENU_CATEGORY_LIBRARY = 5; +const MENU_CATEGORY_SHOP = 6; // otserv versions -define('OTSERV', 1); -define('OTSERV_06', 2); -define('OTSERV_FIRST', OTSERV); -define('OTSERV_LAST', OTSERV_06); -define('TFS_02', 3); -define('TFS_03', 4); -define('TFS_FIRST', TFS_02); -define('TFS_LAST', TFS_03); +const OTSERV = 1; +const OTSERV_06 = 2; +const OTSERV_FIRST = OTSERV; +const OTSERV_LAST = OTSERV_06; +const TFS_02 = 3; +const TFS_03 = 4; +const TFS_FIRST = TFS_02; +const TFS_LAST = TFS_03; // basedir $basedir = ''; From 46c058df25472b938b3f41298c805333dec3511f Mon Sep 17 00:00:00 2001 From: slawkens Date: Tue, 28 Dec 2021 07:28:16 +0100 Subject: [PATCH 3/6] Save php sessions in myaac dir Instead of default PHP location This fixes problem with permissions --- .gitignore | 4 ++++ common.php | 4 +++- system/php_sessions/index.html | 0 3 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 system/php_sessions/index.html diff --git a/.gitignore b/.gitignore index 671a8abb..f4f0ae30 100644 --- a/.gitignore +++ b/.gitignore @@ -31,6 +31,10 @@ system/cache/* !system/cache/signatures/index.html !system/cache/plugins/index.html +# php sessions +system/php_sessions/* +!system/cache/index.html + # logs system/logs/* !system/logs/index.html diff --git a/common.php b/common.php index 337b4b5e..2f14939e 100644 --- a/common.php +++ b/common.php @@ -24,7 +24,6 @@ * @link https://my-aac.org */ if (version_compare(phpversion(), '7.1', '<')) die('PHP version 7.1 or higher is required.'); -session_start(); const MYAAC = true; const MYAAC_VERSION = '0.9.0-dev'; @@ -87,6 +86,9 @@ const TFS_03 = 4; const TFS_FIRST = TFS_02; const TFS_LAST = TFS_03; +session_save_path(SYSTEM . 'php_sessions'); +session_start(); + // basedir $basedir = ''; $tmp = explode('/', $_SERVER['SCRIPT_NAME']); diff --git a/system/php_sessions/index.html b/system/php_sessions/index.html new file mode 100644 index 00000000..e69de29b From a43d641b5f424d8b4163d4d91a617bd18c2a69a1 Mon Sep 17 00:00:00 2001 From: slawkens Date: Sun, 2 Jan 2022 07:31:57 +0100 Subject: [PATCH 4/6] Fixes (config.news_author, group_name|capitalize) --- system/templates/guilds.list.html.twig | 2 +- system/templates/news.html.twig | 2 +- system/templates/team.html.twig | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/system/templates/guilds.list.html.twig b/system/templates/guilds.list.html.twig index 143e5302..f366cdcd 100644 --- a/system/templates/guilds.list.html.twig +++ b/system/templates/guilds.list.html.twig @@ -133,7 +133,7 @@ {% include('buttons.base.html.twig') %} {% else %} - Before you can create guild you must login. + Before you can create a guild you must login.
{% include('buttons.login.html.twig') %} diff --git a/system/templates/news.html.twig b/system/templates/news.html.twig index 2eb26a1a..28a6fcf8 100644 --- a/system/templates/news.html.twig +++ b/system/templates/news.html.twig @@ -3,7 +3,7 @@
{{ date|date(config.news_date_format) }} -
{{ title }}
- {% if author is not empty %} + {% config.news_author and if author is not empty %}
Author: {{ author }}
{% endif %} diff --git a/system/templates/team.html.twig b/system/templates/team.html.twig index 515dffab..d3ec7951 100644 --- a/system/templates/team.html.twig +++ b/system/templates/team.html.twig @@ -60,7 +60,7 @@ {% for member in group.members|reverse %} {% set i = i + 1 %} - {{ group.group_name }} + {{ group.group_name|capitalize }} {% if config.team_display_outfit %} @@ -104,7 +104,7 @@ {% elseif config.team_style == 2 %} {% for group in groupmember|reverse %} {% if group.members is not empty %} -

{{ group.group_name }}

+

{{ group.group_name|capitalize }}

From 8bca099037b38b9b19b1d77a5e51f6b5772779ef Mon Sep 17 00:00:00 2001 From: slawkens Date: Fri, 7 Jan 2022 08:32:18 +0100 Subject: [PATCH 5/6] Fix typo --- system/templates/news.html.twig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/templates/news.html.twig b/system/templates/news.html.twig index 28a6fcf8..79c11b7e 100644 --- a/system/templates/news.html.twig +++ b/system/templates/news.html.twig @@ -3,7 +3,7 @@
{{ date|date(config.news_date_format) }} -
{{ title }}
- {% config.news_author and if author is not empty %} + {% if config.news_author and author is not empty %}
Author: {{ author }}
{% endif %} From 091828e8f1d979825ce6f954692b1548cfabed88 Mon Sep 17 00:00:00 2001 From: slawkens Date: Fri, 14 Jan 2022 19:41:11 +0100 Subject: [PATCH 6/6] Add php_sessions to .gitignore --- .gitignore | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index f4f0ae30..3d9b6ccb 100644 --- a/.gitignore +++ b/.gitignore @@ -31,10 +31,6 @@ system/cache/* !system/cache/signatures/index.html !system/cache/plugins/index.html -# php sessions -system/php_sessions/* -!system/cache/index.html - # logs system/logs/* !system/logs/index.html @@ -43,6 +39,10 @@ system/logs/* system/data/* !system/data/index.html +# php sessions +system/php_sessions/* +!system/php_sessions/index.html + # plugins plugins/* !plugins/.htaccess