Merge branch 'develop' into feature/new-router

.gitignore

@@ -39,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

common.php

@@ -24,68 +24,70 @@
  * @link      https://my-aac.org
  */
 if (version_compare(phpversion(), '7.1', '<')) die('PHP version 7.1 or higher is required.');
-session_start();
 
-define('MYAAC', true);
+const MYAAC = true;
-define('MYAAC_VERSION', '0.9.0-dev');
+const MYAAC_VERSION = '0.9.0-dev';
-define('DATABASE_VERSION', 32);
+const DATABASE_VERSION = 32;
-define('TABLE_PREFIX', 'myaac_');
+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);
+const FLAG_ADMIN = 1;
-define('FLAG_SUPER_ADMIN', 2);
+const FLAG_SUPER_ADMIN = 2;
-define('FLAG_CONTENT_PAGES', 4);
+const FLAG_CONTENT_PAGES = 4;
-define('FLAG_CONTENT_MAILER', 8);
+const FLAG_CONTENT_MAILER = 8;
-define('FLAG_CONTENT_NEWS', 16);
+const FLAG_CONTENT_NEWS = 16;
-define('FLAG_CONTENT_FORUM', 32);
+const FLAG_CONTENT_FORUM = 32;
-define('FLAG_CONTENT_COMMANDS', 64);
+const FLAG_CONTENT_COMMANDS = 64;
-define('FLAG_CONTENT_SPELLS', 128);
+const FLAG_CONTENT_SPELLS = 128;
-define('FLAG_CONTENT_MONSTERS', 256);
+const FLAG_CONTENT_MONSTERS = 256;
-define('FLAG_CONTENT_GALLERY', 512);
+const FLAG_CONTENT_GALLERY = 512;
-define('FLAG_CONTENT_VIDEOS', 1024);
+const FLAG_CONTENT_VIDEOS = 1024;
-define('FLAG_CONTENT_FAQ', 2048);
+const FLAG_CONTENT_FAQ = 2048;
-define('FLAG_CONTENT_MENUS', 4096);
+const FLAG_CONTENT_MENUS = 4096;
-define('FLAG_CONTENT_PLAYERS', 8192);
+const FLAG_CONTENT_PLAYERS = 8192;
 
 // news
-define('NEWS', 1);
+const NEWS = 1;
-define('TICKER', 2);
+const TICKER = 2;
-define('ARTICLE', 3);
+const ARTICLE = 3;
 
 // directories
-define('BASE', __DIR__ . '/');
+const BASE = __DIR__ . '/';
-define('ADMIN', BASE . 'admin/');
+const ADMIN = BASE . 'admin/';
-define('SYSTEM', BASE . 'system/');
+const SYSTEM = BASE . 'system/';
-define('CACHE', SYSTEM . 'cache/');
+const CACHE = SYSTEM . 'cache/';
-define('LOCALE', SYSTEM . 'locale/');
+const LOCALE = SYSTEM . 'locale/';
-define('LIBS', SYSTEM . 'libs/');
+const LIBS = SYSTEM . 'libs/';
-define('LOGS', SYSTEM . 'logs/');
+const LOGS = SYSTEM . 'logs/';
-define('PAGES', SYSTEM . 'pages/');
+const PAGES = SYSTEM . 'pages/';
-define('PLUGINS', BASE . 'plugins/');
+const PLUGINS = BASE . 'plugins/';
-define('TEMPLATES', BASE . 'templates/');
+const TEMPLATES = BASE . 'templates/';
-define('TOOLS', BASE . 'tools/');
+const TOOLS = BASE . 'tools/';
-define('VENDOR', BASE . 'vendor/');
+const VENDOR = BASE . 'vendor/';
 
 // menu categories
-define('MENU_CATEGORY_NEWS', 1);
+const MENU_CATEGORY_NEWS = 1;
-define('MENU_CATEGORY_ACCOUNT', 2);
+const MENU_CATEGORY_ACCOUNT = 2;
-define('MENU_CATEGORY_COMMUNITY', 3);
+const MENU_CATEGORY_COMMUNITY = 3;
-define('MENU_CATEGORY_FORUM', 4);
+const MENU_CATEGORY_FORUM = 4;
-define('MENU_CATEGORY_LIBRARY', 5);
+const MENU_CATEGORY_LIBRARY = 5;
-define('MENU_CATEGORY_SHOP', 6);
+const MENU_CATEGORY_SHOP = 6;
 
 // otserv versions
-define('OTSERV', 1);
+const OTSERV = 1;
-define('OTSERV_06', 2);
+const OTSERV_06 = 2;
-define('OTSERV_FIRST', OTSERV);
+const OTSERV_FIRST = OTSERV;
-define('OTSERV_LAST', OTSERV_06);
+const OTSERV_LAST = OTSERV_06;
-define('TFS_02', 3);
+const TFS_02 = 3;
-define('TFS_03', 4);
+const TFS_03 = 4;
-define('TFS_FIRST', TFS_02);
+const TFS_FIRST = TFS_02;
-define('TFS_LAST', TFS_03);
+const TFS_LAST = TFS_03;
+
+session_save_path(SYSTEM . 'php_sessions');
+session_start();
 
 // basedir
 $basedir = '';

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();
 	}

system/templates/browsehappy.html.twig

@@ -0,0 +1,3 @@
+<!--[if lt IE 7]>
+<p class="browsehappy">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
+<![endif]-->

system/templates/guilds.list.html.twig

@@ -133,7 +133,7 @@
                             {% include('buttons.base.html.twig') %}
                         </form>
                         {% else %}
-                        <b>Before you can create guild you must login.</b>
+                        <b>Before you can create a guild you must login.</b>
                         <br/>
                         <form action="?subtopic=accountmanagement&redirect={{ getLink('guilds') }}" method="post">
                             {% include('buttons.login.html.twig') %}

system/templates/news.html.twig

@@ -3,7 +3,7 @@
 		<img src="{{ constant('BASE_URL') }}images/news/icon_{{ icon }}.gif" class="NewsHeadlineIcon" />
 		<div class="NewsHeadlineDate">{{ date|date(config.news_date_format) }} - </div>
 		<div class="NewsHeadlineText">{{ title }}</div>
-		{% if author is not empty %}
+		{% if config.news_author and author is not empty %}
 		<div class="NewsHeadlineAuthor"><b>Author: </b><i>{{ author }}</i></div>
 		{% endif %}
 	</div>

system/templates/team.html.twig

@@ -60,7 +60,7 @@
 									{% for member in group.members|reverse %}
 									{% set i = i + 1 %}
 									<tr bgcolor="{{ getStyle(i) }}" style="height: 32px;">
-										<td>{{ group.group_name }}</td>
+										<td>{{ group.group_name|capitalize }}</td>
 
 										{% if config.team_display_outfit %}
 										<td>
@@ -104,7 +104,7 @@
 					{% elseif config.team_style == 2 %}
 						{% for group in groupmember|reverse %}
 							{% if group.members is not empty %}
-							<div style="text-align:center"><h2>{{ group.group_name }}</h2></div>
+							<div style="text-align:center"><h2>{{ group.group_name|capitalize }}</h2></div>
 
 							<table cellspacing="1" cellpadding="4" border="0" width="100%">
 								<tr bgcolor="{{ config.vdarkborder }}">