Digitalstack/myaac
2
0
Fork 0
mirror of https://github.com/slawkens/myaac.git synced 2025-12-08 10:16:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed some bugs at last install screen (unset country and HTTPS protocol definition)

Browse Source
This commit is contained in:
outkast
2019-04-18 20:29:16 -04:00
parent 5ad82a305e
commit 997f8d3aad
3 changed files with 26 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
install/includes/schema.sql
View File

@@ -6,7 +6,7 @@ CREATE TABLE `myaac_account_actions`
`date` INT(11) NOT NULL DEFAULT 0, `date` INT(11) NOT NULL DEFAULT 0,
`action` VARCHAR(255) NOT NULL DEFAULT '', `action` VARCHAR(255) NOT NULL DEFAULT '',
KEY (`account_id`) KEY (`account_id`)
) ENGINE = MyISAM; ) ENGINE = MyISAM DEFAULT CHARSET=latin1;
CREATE TABLE `myaac_admin_menu` CREATE TABLE `myaac_admin_menu`
( (
@@ -17,7 +17,7 @@ CREATE TABLE `myaac_admin_menu`
`flags` INT(11) NOT NULL DEFAULT 0, `flags` INT(11) NOT NULL DEFAULT 0,
`enabled` INT(1) NOT NULL DEFAULT 1, `enabled` INT(1) NOT NULL DEFAULT 1,
PRIMARY KEY (`id`) PRIMARY KEY (`id`)
) ENGINE = MyISAM; ) ENGINE = MyISAM DEFAULT CHARSET=latin1;
CREATE TABLE `myaac_bugtracker` CREATE TABLE `myaac_bugtracker`
( (
@@ -32,7 +32,7 @@ CREATE TABLE `myaac_bugtracker`
`uid` INT(11) NOT NULL AUTO_INCREMENT, `uid` INT(11) NOT NULL AUTO_INCREMENT,
`tag` INT(11) NOT NULL DEFAULT 0, `tag` INT(11) NOT NULL DEFAULT 0,
PRIMARY KEY (`uid`) PRIMARY KEY (`uid`)
) ENGINE = MyISAM; ) ENGINE = MyISAM DEFAULT CHARSET=latin1;
CREATE TABLE `myaac_changelog` CREATE TABLE `myaac_changelog`
( (
@@ -44,7 +44,7 @@ CREATE TABLE `myaac_changelog`
`player_id` INT(11) NOT NULL DEFAULT 0, `player_id` INT(11) NOT NULL DEFAULT 0,
`hidden` TINYINT(1) NOT NULL DEFAULT 0, `hidden` TINYINT(1) NOT NULL DEFAULT 0,
PRIMARY KEY (`id`) PRIMARY KEY (`id`)
) ENGINE = MyISAM; ) ENGINE = MyISAM DEFAULT CHARSET=latin1;
INSERT INTO `myaac_changelog` (`id`, `type`, `where`, `date`, `body`, `hidden`) VALUES (1, 3, 2, UNIX_TIMESTAMP(), 'MyAAC installed. (:', 0); INSERT INTO `myaac_changelog` (`id`, `type`, `where`, `date`, `body`, `hidden`) VALUES (1, 3, 2, UNIX_TIMESTAMP(), 'MyAAC installed. (:', 0);
@@ -57,7 +57,7 @@ CREATE TABLE `myaac_commands`
`hidden` TINYINT(1) NOT NULL DEFAULT 0, `hidden` TINYINT(1) NOT NULL DEFAULT 0,
PRIMARY KEY (`id`), PRIMARY KEY (`id`),
UNIQUE (`words`) UNIQUE (`words`)
) ENGINE = MyISAM; ) ENGINE = MyISAM DEFAULT CHARSET=latin1;
CREATE TABLE `myaac_config` CREATE TABLE `myaac_config`
( (
@@ -66,7 +66,7 @@ CREATE TABLE `myaac_config`
`value` VARCHAR(1000) NOT NULL, `value` VARCHAR(1000) NOT NULL,
PRIMARY KEY (`id`), PRIMARY KEY (`id`),
UNIQUE (`name`) UNIQUE (`name`)
) ENGINE = MyISAM; ) ENGINE = MyISAM DEFAULT CHARSET=latin1;
CREATE TABLE `myaac_faq` CREATE TABLE `myaac_faq`
( (
@@ -76,7 +76,7 @@ CREATE TABLE `myaac_faq`
`ordering` INT(11) NOT NULL DEFAULT 0, `ordering` INT(11) NOT NULL DEFAULT 0,
`hidden` TINYINT(1) NOT NULL DEFAULT 0, `hidden` TINYINT(1) NOT NULL DEFAULT 0,
PRIMARY KEY (`id`) PRIMARY KEY (`id`)
) ENGINE = MyISAM; ) ENGINE = MyISAM DEFAULT CHARSET=latin1;
CREATE TABLE `myaac_forum_boards` CREATE TABLE `myaac_forum_boards`
( (
@@ -89,7 +89,7 @@ CREATE TABLE `myaac_forum_boards`
`closed` TINYINT(1) NOT NULL DEFAULT 0, `closed` TINYINT(1) NOT NULL DEFAULT 0,
`hidden` TINYINT(1) NOT NULL DEFAULT 0, `hidden` TINYINT(1) NOT NULL DEFAULT 0,
PRIMARY KEY (`id`) PRIMARY KEY (`id`)
) ENGINE = MyISAM; ) ENGINE = MyISAM DEFAULT CHARSET=latin1;
INSERT INTO `myaac_forum_boards` (`id`, `name`, `description`, `ordering`, `closed`) VALUES (NULL, 'News', 'News commenting', 0, 1); INSERT INTO `myaac_forum_boards` (`id`, `name`, `description`, `ordering`, `closed`) VALUES (NULL, 'News', 'News commenting', 0, 1);
INSERT INTO `myaac_forum_boards` (`id`, `name`, `description`, `ordering`) VALUES (NULL, 'Trade', 'Trade offers.', 1); INSERT INTO `myaac_forum_boards` (`id`, `name`, `description`, `ordering`) VALUES (NULL, 'Trade', 'Trade offers.', 1);
INSERT INTO `myaac_forum_boards` (`id`, `name`, `description`, `ordering`) VALUES (NULL, 'Quests', 'Quest making.', 2); INSERT INTO `myaac_forum_boards` (`id`, `name`, `description`, `ordering`) VALUES (NULL, 'Quests', 'Quest making.', 2);
@@ -118,7 +118,7 @@ CREATE TABLE `myaac_forum`
`closed` INT(11) NOT NULL DEFAULT '0', `closed` INT(11) NOT NULL DEFAULT '0',
PRIMARY KEY (`id`), PRIMARY KEY (`id`),
KEY `section` (`section`) KEY `section` (`section`)
) ENGINE = MyISAM; ) ENGINE = MyISAM DEFAULT CHARSET=latin1;
CREATE TABLE `myaac_hooks` CREATE TABLE `myaac_hooks`
( (
@@ -129,7 +129,7 @@ CREATE TABLE `myaac_hooks`
`ordering` INT(11) NOT NULL DEFAULT 0, `ordering` INT(11) NOT NULL DEFAULT 0,
`enabled` INT(1) NOT NULL DEFAULT 1, `enabled` INT(1) NOT NULL DEFAULT 1,
PRIMARY KEY (`id`) PRIMARY KEY (`id`)
) ENGINE = MyISAM; ) ENGINE = MyISAM DEFAULT CHARSET=latin1;
CREATE TABLE `myaac_items` CREATE TABLE `myaac_items`
( (
@@ -139,7 +139,7 @@ CREATE TABLE `myaac_items`
`plural` VARCHAR(50) NOT NULL DEFAULT '', `plural` VARCHAR(50) NOT NULL DEFAULT '',
`attributes` VARCHAR(500) NOT NULL DEFAULT '', `attributes` VARCHAR(500) NOT NULL DEFAULT '',
PRIMARY KEY (`id`) PRIMARY KEY (`id`)
) ENGINE = MyISAM; ) ENGINE = MyISAM DEFAULT CHARSET=latin1;
CREATE TABLE `myaac_menu` CREATE TABLE `myaac_menu`
( (
@@ -153,7 +153,7 @@ CREATE TABLE `myaac_menu`
`ordering` INT(11) NOT NULL DEFAULT 0, `ordering` INT(11) NOT NULL DEFAULT 0,
`enabled` INT(1) NOT NULL DEFAULT 1, `enabled` INT(1) NOT NULL DEFAULT 1,
PRIMARY KEY (`id`) PRIMARY KEY (`id`)
) ENGINE = MyISAM; ) ENGINE = MyISAM DEFAULT CHARSET=latin1;
/* MENU_CATEGORY_NEWS kathrine */ /* MENU_CATEGORY_NEWS kathrine */
INSERT INTO `myaac_menu` (`template`, `name`, `link`, `category`, `ordering`) VALUES ('kathrine', 'Latest News', 'news', 1, 0); INSERT INTO `myaac_menu` (`template`, `name`, `link`, `category`, `ordering`) VALUES ('kathrine', 'Latest News', 'news', 1, 0);
@@ -240,7 +240,7 @@ CREATE TABLE `myaac_monsters` (
`race` varchar(255) NOT NULL, `race` varchar(255) NOT NULL,
`loot` varchar(500) NOT NULL, `loot` varchar(500) NOT NULL,
PRIMARY KEY (`id`) PRIMARY KEY (`id`)
) ENGINE = MyISAM; ) ENGINE = MyISAM DEFAULT CHARSET=latin1;
CREATE TABLE `myaac_videos` CREATE TABLE `myaac_videos`
( (
@@ -251,7 +251,7 @@ CREATE TABLE `myaac_videos`
`ordering` INT(11) NOT NULL DEFAULT 0, `ordering` INT(11) NOT NULL DEFAULT 0,
`hidden` TINYINT(1) NOT NULL DEFAULT 0, `hidden` TINYINT(1) NOT NULL DEFAULT 0,
PRIMARY KEY (`id`) PRIMARY KEY (`id`)
) ENGINE = MyISAM; ) ENGINE = MyISAM DEFAULT CHARSET=latin1;
CREATE TABLE `myaac_news` CREATE TABLE `myaac_news`
( (
@@ -269,7 +269,7 @@ CREATE TABLE `myaac_news`
`article_image` VARCHAR(100) NOT NULL DEFAULT '', `article_image` VARCHAR(100) NOT NULL DEFAULT '',
`hidden` TINYINT(1) NOT NULL DEFAULT 0, `hidden` TINYINT(1) NOT NULL DEFAULT 0,
PRIMARY KEY (`id`) PRIMARY KEY (`id`)
) ENGINE = MyISAM; ) ENGINE = MyISAM DEFAULT CHARSET=latin1;
CREATE TABLE `myaac_news_categories` CREATE TABLE `myaac_news_categories`
( (
@@ -279,7 +279,7 @@ CREATE TABLE `myaac_news_categories`
`icon_id` INT(2) NOT NULL DEFAULT 0, `icon_id` INT(2) NOT NULL DEFAULT 0,
`hidden` TINYINT(1) NOT NULL DEFAULT 0, `hidden` TINYINT(1) NOT NULL DEFAULT 0,
PRIMARY KEY (`id`) PRIMARY KEY (`id`)
) ENGINE = MyISAM; ) ENGINE = MyISAM DEFAULT CHARSET=latin1;
INSERT INTO `myaac_news_categories` (`id`, `icon_id`) VALUES (NULL, 0); INSERT INTO `myaac_news_categories` (`id`, `icon_id`) VALUES (NULL, 0);
INSERT INTO `myaac_news_categories` (`id`, `icon_id`) VALUES (NULL, 1); INSERT INTO `myaac_news_categories` (`id`, `icon_id`) VALUES (NULL, 1);
@@ -295,7 +295,7 @@ CREATE TABLE `myaac_notepad`
`content` TEXT NOT NULL, `content` TEXT NOT NULL,
/*`public` TINYINT(1) NOT NULL DEFAULT 0*/ /*`public` TINYINT(1) NOT NULL DEFAULT 0*/
PRIMARY KEY (`id`) PRIMARY KEY (`id`)
) ENGINE = MyISAM; ) ENGINE = MyISAM DEFAULT CHARSET=latin1;
CREATE TABLE `myaac_pages` CREATE TABLE `myaac_pages`
( (
@@ -309,7 +309,7 @@ CREATE TABLE `myaac_pages`
`access` TINYINT(2) NOT NULL DEFAULT 0, `access` TINYINT(2) NOT NULL DEFAULT 0,
`hidden` TINYINT(1) NOT NULL DEFAULT 0, `hidden` TINYINT(1) NOT NULL DEFAULT 0,
PRIMARY KEY (`id`) PRIMARY KEY (`id`)
) ENGINE = MyISAM; ) ENGINE = MyISAM DEFAULT CHARSET=latin1;
CREATE TABLE `myaac_gallery` CREATE TABLE `myaac_gallery`
( (
@@ -321,7 +321,7 @@ CREATE TABLE `myaac_gallery`
`ordering` INT(11) NOT NULL DEFAULT 0, `ordering` INT(11) NOT NULL DEFAULT 0,
`hidden` TINYINT(1) NOT NULL DEFAULT 0, `hidden` TINYINT(1) NOT NULL DEFAULT 0,
PRIMARY KEY (`id`) PRIMARY KEY (`id`)
) ENGINE = MyISAM; ) ENGINE = MyISAM DEFAULT CHARSET=latin1;
INSERT INTO `myaac_gallery` (`id`, `ordering`, `comment`, `image`, `thumb`, `author`) VALUES (NULL, 1, 'Demon', 'images/gallery/demon.jpg', 'images/gallery/demon_thumb.gif', 'MyAAC'); INSERT INTO `myaac_gallery` (`id`, `ordering`, `comment`, `image`, `thumb`, `author`) VALUES (NULL, 1, 'Demon', 'images/gallery/demon.jpg', 'images/gallery/demon_thumb.gif', 'MyAAC');
@@ -344,7 +344,7 @@ CREATE TABLE `myaac_spells`
`hidden` TINYINT(1) NOT NULL DEFAULT 0, `hidden` TINYINT(1) NOT NULL DEFAULT 0,
PRIMARY KEY (`id`), PRIMARY KEY (`id`),
UNIQUE (`name`) UNIQUE (`name`)
) ENGINE = MyISAM; ) ENGINE = MyISAM DEFAULT CHARSET=latin1;
CREATE TABLE `myaac_visitors` CREATE TABLE `myaac_visitors`
( (
@@ -352,7 +352,7 @@ CREATE TABLE `myaac_visitors`
`lastvisit` INT(11) NOT NULL DEFAULT 0, `lastvisit` INT(11) NOT NULL DEFAULT 0,
`page` VARCHAR(100) NOT NULL, `page` VARCHAR(100) NOT NULL,
UNIQUE (`ip`) UNIQUE (`ip`)
) ENGINE = MyISAM; ) ENGINE = MyISAM DEFAULT CHARSET=latin1;
CREATE TABLE `myaac_weapons` CREATE TABLE `myaac_weapons`
( (
@@ -361,4 +361,4 @@ CREATE TABLE `myaac_weapons`
`maglevel` INT(11) NOT NULL DEFAULT 0, `maglevel` INT(11) NOT NULL DEFAULT 0,
`vocations` VARCHAR(100) NOT NULL DEFAULT '', `vocations` VARCHAR(100) NOT NULL DEFAULT '',
PRIMARY KEY (`id`) PRIMARY KEY (`id`)
) ENGINE = MyISAM; ) ENGINE = MyISAM DEFAULT CHARSET=latin1;

4
install/steps/7-finish.php
View File

@@ -47,6 +47,7 @@ else {
if($account_db->isLoaded()) { if($account_db->isLoaded()) {
$account_db->setPassword(encrypt($password)); $account_db->setPassword(encrypt($password));
$account_db->setEMail($_SESSION['var_mail_admin']); $account_db->setEMail($_SESSION['var_mail_admin']);
$account_db->setCountry("--");
$account_db->save(); $account_db->save();
$account_used = &$account_db; $account_used = &$account_db;
@@ -62,6 +63,7 @@ else {
$new_account->setPassword(encrypt($password)); $new_account->setPassword(encrypt($password));
$new_account->setEMail($_SESSION['var_mail_admin']); $new_account->setEMail($_SESSION['var_mail_admin']);
$new_account->setCountry("--");
$new_account->unblock(); $new_account->unblock();
$new_account->save(); $new_account->save();
@@ -121,7 +123,7 @@ else {
)); ));
if(!isset($_SESSION['installed'])) { if(!isset($_SESSION['installed'])) {
file_get_contents('http://my-aac.org/report_install.php?v=' . MYAAC_VERSION . '&b=' . urlencode(BASE_URL)); file_get_contents('http' . ini_get('allow_url_fopen') ? "" : "s" .'://my-aac.org/report_install.php?v=' . MYAAC_VERSION . '&b=' . urlencode(BASE_URL));
$_SESSION['installed'] = true; $_SESSION['installed'] = true;
} }

2
install/tools/5-database.php
View File

@@ -153,7 +153,7 @@ if(!$db->hasColumn('accounts', 'premium_points')) {
} }
if(!$db->hasColumn('guilds', 'motd')) { if(!$db->hasColumn('guilds', 'motd')) {
if(query("ALTER TABLE `guilds` MODIFY `motd` VARCHAR(255) NOT NULL DEFAULT '';")) if(query("ALTER TABLE `guilds` ADD `motd` VARCHAR(255) NOT NULL DEFAULT '';"))
success($locale['step_database_modifying_field'] . ' guilds.motd...'); success($locale['step_database_modifying_field'] . ' guilds.motd...');
} }