diff --git a/images/payments/daopay.gif b/images/payments/daopay.gif deleted file mode 100644 index c986cc23..00000000 Binary files a/images/payments/daopay.gif and /dev/null differ diff --git a/images/payments/dotpay.png b/images/payments/dotpay.png deleted file mode 100644 index b587080d..00000000 Binary files a/images/payments/dotpay.png and /dev/null differ diff --git a/images/payments/paypal.gif b/images/payments/paypal.gif deleted file mode 100644 index 969a19bf..00000000 Binary files a/images/payments/paypal.gif and /dev/null differ diff --git a/images/payments/sms.gif b/images/payments/sms.gif deleted file mode 100644 index a1f59774..00000000 Binary files a/images/payments/sms.gif and /dev/null differ diff --git a/index.php b/index.php index b8de5833..9140bdae 100644 --- a/index.php +++ b/index.php @@ -72,7 +72,7 @@ else { // register first version require(SYSTEM . 'migrations/' . $i . '.php'); } - updateDatabaseConfig('database_version', DATABASE_VERSION); + registerDatabaseConfig('database_version', DATABASE_VERSION); } // event system diff --git a/install/includes/schema.sql b/install/includes/schema.sql index 4082dc74..ccb8ecda 100644 --- a/install/includes/schema.sql +++ b/install/includes/schema.sql @@ -55,7 +55,6 @@ CREATE TABLE `myaac_config` PRIMARY KEY (`id`), UNIQUE (`name`) ) ENGINE = MyISAM; -INSERT INTO `myaac_config` (`id`, `name`, `value`) VALUES (NULL, 'database_version', '1'); CREATE TABLE `myaac_faq` ( diff --git a/install/steps/database.php b/install/steps/database.php index 79f28746..7b574c11 100644 --- a/install/steps/database.php +++ b/install/steps/database.php @@ -66,6 +66,7 @@ if(!$error) { } if(!$error) { + registerDatabaseConfig('database_version', DATABASE_VERSION); $locale['step_database_success_schema'] = str_replace('$PREFIX$', TABLE_PREFIX, $locale['step_database_success_schema']); success($locale['step_database_success_schema']); } diff --git a/system/pages/characters.php b/system/pages/characters.php index 5269b824..b27356c5 100644 --- a/system/pages/characters.php +++ b/system/pages/characters.php @@ -77,11 +77,11 @@ function generate_player_lookup($player) } $skulls = array( - 1 => 'skull_yellow', - 2 => 'skull_green', - 3 => 'skull_white', - 4 => 'skull_red', - 5 => 'skull_black' + 1 => 'yellow_skull', + 2 => 'green_skull', + 3 => 'white_skull', + 4 => 'red_skull', + 5 => 'black_skull' ); return ' diff --git a/system/pages/movies.php b/system/pages/movies.php index 604e61d9..0ad9f69f 100644 --- a/system/pages/movies.php +++ b/system/pages/movies.php @@ -26,6 +26,6 @@ There are no movies added yet.
Author:
-

'; +

diff --git a/system/pages/online.php b/system/pages/online.php index 5cc72bc8..37e83430 100644 --- a/system/pages/online.php +++ b/system/pages/online.php @@ -66,11 +66,11 @@ foreach($playersOnline as $player) if($config['online_skulls']) { if($player['skulltime'] > 0 && $player['skull'] == 3) - $skull = ' '; + $skull = ' '; elseif($player['skulltime'] > 0 && $player['skull'] == 4) - $skull = ' '; + $skull = ' '; elseif($player['skulltime'] > 0 && $player['skull'] == 5) - $skull = ' '; + $skull = ' '; } if(isset($player['promotion'])) { @@ -195,9 +195,9 @@ if($config['online_skulls']): ?>
- - 1 - 6 Frags
- - 6+ Frags or Red Skull
- - 10+ Frags or Black Skull + - 1 - 6 Frags
+ - 6+ Frags or Red Skull
+ - 10+ Frags or Black Skull
diff --git a/templates/kathrine/template.php b/templates/kathrine/template.php index 133f7c92..3d134e88 100644 --- a/templates/kathrine/template.php +++ b/templates/kathrine/template.php @@ -173,6 +173,7 @@ defined('MYAAC') or die('Direct access not allowed!');
+
diff --git a/tools/signature/tibian.php b/tools/signature/tibian.php index ce0ff616..56d2752c 100644 --- a/tools/signature/tibian.php +++ b/tools/signature/tibian.php @@ -115,7 +115,7 @@ // premium status $account = $player->getAccount(); - imagettftext($img, $fontsize, 0, 15, 140, $text, $font, $account->getCustomField('premdays') == 0 ? 'Free Account' : 'Premium Account'); + imagettftext($img, $fontsize, 0, 15, 140, $text, $font, $account->getPremDays() > 0 ? 'Premium Account': 'Free Account'); imagefilledrectangle($img, 225, 40, 225, 130, $title); //seperator $posy = 50;