Merge branch 'master' of https://github.com/slawkens/myaac

CHANGELOG

@@ -1,3 +1,21 @@
+[0.3.0 - 28.08.2017]
+	- added administration panel for screenshots management with auto thumbnail generator and image auto-resizing
+	- added Twig template engine and moved some html-in-php code to it
+	- automatically detect player country based on user location (IP) on create account
+	- player sex (gender) is now configurable at $config['genders']
+	- fixed recovering account and changing password when salt is enabled
+	- fixed installing samples when for example Rook Sample already exist and other samples not
+	- fixed some mysql error when character you trying to create already exist
+	- fixed some warning when you select nonexistent country
+	- password change minimal/maximal length notice is now more precise
+	- added 'enabled' field in myaac_hooks table, which can enable or disable specified hook
+	- removed DEFAULT '' for TEXT field. It didn't worked under some systems like MAC OS X.
+	- minimum PHP version to install the MyAAC is now 5.2.0 cause of pathinfo (extension) function
+	- removed unused admin stylish template
+	- removed some unused cities field from myaac_spells table
+	- moved news adding at installation from schema.sql to finish.php
+	- some optimizations
+
 [0.2.4 - 09.06.2017]
 	- fixed invite to guild
 	- added id field on monsters, so you can delete them in phpmyadmin
@@ -6,6 +24,7 @@
 	- fixed when file is unable to parse (creatures)
 	- fixed typo loss_items => loss_containers
 	- more elegant way of showing message on reload creatures and spells
+
 [0.2.3 - 31.05.2017]
 	- fixed guild management on OTHire 0.0.3
 	- set default skills to 10 when creating new character

common.php

@@ -21,13 +21,13 @@
  * @package   MyAAC
  * @author    Slawkens <slawkens@gmail.com>
  * @copyright 2017 MyAAC
- * @version   0.2.4
+ * @version   0.3.0
  * @link      http://my-aac.org
  */
 session_start();
 
 define('MYAAC', true);
-define('MYAAC_VERSION', '0.2.4');
+define('MYAAC_VERSION', '0.3.0');
 define('DATABASE_VERSION', 7);
 define('TABLE_PREFIX', 'myaac_');
 define('START_TIME', microtime(true));

config.php

@@ -13,7 +13,7 @@
  * @package   MyAAC
  * @author    Slawkens <slawkens@gmail.com>
  * @copyright 2017 MyAAC
- * @version   0.2.4
+ * @version   0.3.0
  * @link      http://my-aac.org
  */
 

index.php

@@ -21,7 +21,7 @@
  * @package   MyAAC
  * @author    Slawkens <slawkens@gmail.com>
  * @copyright 2017 MyAAC
- * @version   0.2.4
+ * @version   0.3.0
  * @link      http://my-aac.org
  */
 

system/compat_pages.php

@@ -5,7 +5,7 @@
  * @package   MyAAC
  * @author    Slawkens <slawkens@gmail.com>
  * @copyright 2017 MyAAC
- * @version   0.2.4
+ * @version   0.3.0
  * @link      http://my-aac.org
  */
 defined('MYAAC') or die('Direct access not allowed!');

system/counter.php

@@ -5,7 +5,7 @@
  * @package   MyAAC
  * @author    Slawkens <slawkens@gmail.com>
  * @copyright 2017 MyAAC
- * @version   0.2.4
+ * @version   0.3.0
  * @link      http://my-aac.org
  */
 defined('MYAAC') or die('Direct access not allowed!');

system/countries.conf.php

@@ -5,7 +5,7 @@
  * @package   MyAAC
  * @author    Slawkens <slawkens@gmail.com>
  * @copyright 2017 MyAAC
- * @version   0.2.4
+ * @version   0.3.0
  * @link      http://my-aac.org
  */
 defined('MYAAC') or die('Direct access not allowed!');

system/functions.php

@@ -5,7 +5,7 @@
  * @package   MyAAC
  * @author    Slawkens <slawkens@gmail.com>
  * @copyright 2017 MyAAC
- * @version   0.2.4
+ * @version   0.3.0
  * @link      http://my-aac.org
  */
 defined('MYAAC') or die('Direct access not allowed!');
@@ -1202,7 +1202,7 @@ function convert_bytes($size)
 function log_append($file, $str)
 {
 	$f = fopen(LOGS . $file, 'a');
-	fwrite($f, $str . PHP_EOL);
+	fwrite($f, '[' . date(DateTime::RFC1123) . '] ' . $str . PHP_EOL);
 	fclose($f);
 }
 
@@ -1215,8 +1215,11 @@ function load_config_lua($filename)
 		die('ERROR: Cannot find ' . $filename . ' file.');
 
 	$tempFile = @tempnam('/tmp', 'lua');
-	$file = fopen($tempFile, 'w');
-	if(!$file) die('Cannot load server config!');
+	$file = @fopen($tempFile, 'w');
+	if(!$file) {
+		log_append('error.log', '[functions.php] Cannot load config.lua file. Error: ' . print_r(error_get_last(), true));
+		die('Cannot load server config! More info in system/logs/error.log file.');
+	}
 
 	// TODO: new parser that will also load dofile() includes
 

system/hooks.php

@@ -5,7 +5,7 @@
  * @package   MyAAC
  * @author    Slawkens <slawkens@gmail.com>
  * @copyright 2017 MyAAC
- * @version   0.2.4
+ * @version   0.3.0
  * @link      http://my-aac.org
  */
 defined('MYAAC') or die('Direct access not allowed!');

system/init.php

@@ -5,7 +5,7 @@
  * @package   MyAAC
  * @author    Slawkens <slawkens@gmail.com>
  * @copyright 2017 MyAAC
- * @version   0.2.4
+ * @version   0.3.0
  * @link      http://my-aac.org
  */
 defined('MYAAC') or die('Direct access not allowed!');
@@ -19,7 +19,7 @@ if($config['server_path'][strlen($config['server_path']) - 1] != '/')
 	$config['server_path'] .= '/';
 
 // enable gzip compression if supported by the browser
-if($config['gzip_output'] && (strpos($_SERVER['HTTP_ACCEPT_ENCODING'], 'gzip') !== false) && function_exists('ob_gzhandler'))
+if($config['gzip_output'] && isset($_SERVER['HTTP_ACCEPT_ENCODING']) && strpos($_SERVER['HTTP_ACCEPT_ENCODING'], 'gzip') !== false && function_exists('ob_gzhandler'))
 	ob_start('ob_gzhandler');
 
 // cache
@@ -27,7 +27,7 @@ require_once(SYSTEM . 'libs/cache.php');
 $cache = Cache::getInstance($config['cache_engine'], $config['cache_prefix']);
 
 // twig
-require_once LIBS . 'twig/Autoloader.php';
+require_once LIBS . 'Twig/Autoloader.php';
 Twig_Autoloader::register();
 
 $loader = new Twig_Loader_Filesystem(SYSTEM . 'templates');

system/item.php

@@ -5,7 +5,7 @@
  * @package   MyAAC
  * @author    Slawkens <slawkens@gmail.com>
  * @copyright 2017 MyAAC
- * @version   0.2.4
+ * @version   0.3.0
  * @link      http://my-aac.org
  */
 defined('MYAAC') or die('Direct access not allowed!');