Skip to content
This repository was archived by the owner on Mar 3, 2020. It is now read-only.

Major Performance Enhancements and Bug Fixes #594

Merged
merged 2 commits into from Nov 17, 2017
Merged

Major Performance Enhancements and Bug Fixes #594

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cdcd521
Major Performance Enhancements and Bug Fixes
justinwray Nov 6, 2017
95bbec5
* Updated ActivityLog to delete entries when deleting a team.
justinwray Nov 6, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
"license": "CC-BY-NC-4.0",
"require": {
"facebook/xhp-lib": "2.x",
"facebook/graph-sdk": "5.x",
"google/apiclient": "^2.0"
},
"require-dev": {
Expand Down
63 changes: 61 additions & 2 deletions composer.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 4 additions & 2 deletions database/countries.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,9 @@ CREATE TABLE `countries` (
`enabled` tinyint(1) DEFAULT 0,
`d` text DEFAULT NULL,
`transform` text DEFAULT NULL,
PRIMARY KEY (`id`)
PRIMARY KEY (`id`),
KEY `iso_code` (`iso_code`),
KEY `enabled` (`enabled`)
) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=latin1;
/*!40101 SET character_set_client = @saved_cs_client */;

Expand Down Expand Up @@ -298,4 +300,4 @@ UPDATE `countries` SET enabled = 1 WHERE iso_code = "ZA";
UPDATE `countries` SET enabled = 1 WHERE iso_code = "ZM";
UPDATE `countries` SET enabled = 1 WHERE iso_code = "ZW";
/*!40000 ALTER TABLE `countries` ENABLE KEYS */;
UNLOCK TABLES;
UNLOCK TABLES;
82 changes: 62 additions & 20 deletions database/schema.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ CREATE TABLE `levels` (
`id` int(11) NOT NULL AUTO_INCREMENT,
`active` tinyint(1) NOT NULL,
`type` varchar(4) NOT NULL,
`title` text NOT NULL,
`title` varchar(255) NOT NULL,
`description` text NOT NULL,
`entity_id` int(11) NOT NULL,
`category_id` int(11) NOT NULL,
Expand All @@ -48,7 +48,9 @@ CREATE TABLE `levels` (
`hint` text NOT NULL,
`penalty` int(11) NOT NULL,
`created_ts` timestamp NOT NULL DEFAULT 0,
PRIMARY KEY (`id`)
PRIMARY KEY (`id`),
KEY `entity_id` (`entity_id`),
KEY `active` (`active`)
) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=latin1;
/*!40101 SET character_set_client = @saved_cs_client */;

Expand All @@ -61,7 +63,7 @@ DROP TABLE IF EXISTS `categories`;
/*!40101 SET character_set_client = utf8 */;
CREATE TABLE `categories` (
`id` int(11) NOT NULL AUTO_INCREMENT,
`category` text NOT NULL,
`category` varchar(255) NOT NULL,
`protected` tinyint(1) NOT NULL,
`created_ts` timestamp NOT NULL DEFAULT 0,
PRIMARY KEY (`id`)
Expand Down Expand Up @@ -116,16 +118,18 @@ DROP TABLE IF EXISTS `teams`;
CREATE TABLE `teams` (
`id` int(11) NOT NULL AUTO_INCREMENT,
`active` tinyint(1) NOT NULL DEFAULT 1,
`name` text NOT NULL,
`password_hash` text NOT NULL,
`name` varchar(255) NOT NULL,
`password_hash` varchar(255) NOT NULL,
`points` int(11) NOT NULL DEFAULT 0,
`last_score` timestamp NOT NULL,
`logo` text NOT NULL,
`admin` tinyint(1) NOT NULL DEFAULT 0,
`protected` tinyint(1) NOT NULL DEFAULT 0,
`visible` tinyint(1) NOT NULL DEFAULT 1,
`created_ts` timestamp NOT NULL DEFAULT 0,
PRIMARY KEY (`id`)
PRIMARY KEY (`id`),
KEY `visible` (`visible`),
KEY `active` (`active`)
) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=latin1;
/*!40101 SET character_set_client = @saved_cs_client */;

Expand All @@ -146,6 +150,22 @@ CREATE TABLE `livesync` (
) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=latin1;
/*!40101 SET character_set_client = @saved_cs_client */;

--
-- Table structure for table `teams_oauth`
--

DROP TABLE IF EXISTS `teams_oauth`;
/*!40101 SET @saved_cs_client = @@character_set_client */;
/*!40101 SET character_set_client = utf8 */;
CREATE TABLE `teams_oauth` (
`id` int(11) NOT NULL AUTO_INCREMENT,
`type` text NOT NULL,
`team_id` int(11) NOT NULL,
`token` text NOT NULL,
PRIMARY KEY (`id`)
) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=latin1;
/*!40101 SET character_set_client = @saved_cs_client */;

--
-- Table structure for table `teams_data`
--
Expand All @@ -156,10 +176,11 @@ DROP TABLE IF EXISTS `teams_data`;
CREATE TABLE `teams_data` (
`id` int(11) NOT NULL AUTO_INCREMENT,
`team_id` int(11) NOT NULL,
`name` text NOT NULL,
`email` text NOT NULL,
`name` varchar(255) NOT NULL,
`email` varchar(255) NOT NULL,
`created_ts` timestamp NOT NULL DEFAULT 0,
PRIMARY KEY (`id`)
PRIMARY KEY (`id`),
KEY `team_id` (`team_id`)
) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=latin1;
/*!40101 SET character_set_client = @saved_cs_client */;

Expand All @@ -172,13 +193,14 @@ DROP TABLE IF EXISTS `sessions`;
/*!40101 SET character_set_client = utf8 */;
CREATE TABLE `sessions` (
`id` int(11) NOT NULL AUTO_INCREMENT,
`cookie` text NOT NULL,
`cookie` varchar(200) NOT NULL,
`data` text NOT NULL,
`team_id` int(11) NOT NULL,
`created_ts` timestamp NOT NULL DEFAULT 0,
`last_access_ts` timestamp NOT NULL,
`last_page_access` text NOT NULL,
PRIMARY KEY (`id`)
`last_page_access` varchar(200) NOT NULL,
PRIMARY KEY (`id`),
KEY `cookie` (`cookie`)
) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=latin1;
/*!40101 SET character_set_client = @saved_cs_client */;

Expand Down Expand Up @@ -215,17 +237,25 @@ INSERT INTO `configuration` (field, value, description) VALUES("auto_announce",
INSERT INTO `configuration` (field, value, description) VALUES("progressive_cycle", "300", "(Integer) Frequency to take progressive scoreboard in seconds");
INSERT INTO `configuration` (field, value, description) VALUES("bases_cycle", "5", "(Integer) Frequency to score base levels in seconds");
INSERT INTO `configuration` (field, value, description) VALUES("autorun_cycle", "30", "(Integer) Frequency to cycle autorun in seconds");
INSERT INTO `configuration` (field, value, description) VALUES("gameboard_cycle", "5", "(Integer) Frequency to cycle gameboard in seconds");
INSERT INTO `configuration` (field, value, description) VALUES("conf_cycle", "10", "(Integer) Frequency to cycle configuration and commandline in seconds");
INSERT INTO `configuration` (field, value, description) VALUES("leaderboard_limit", "50", "(Integer) Maximum number of teams to show on the leaderboard");
INSERT INTO `configuration` (field, value, description) VALUES("registration", "0", "(Boolean) Ability to register teams");
INSERT INTO `configuration` (field, value, description) VALUES("registration_names", "0", "(Boolean) Registration will ask for names");
INSERT INTO `configuration` (field, value, description) VALUES("registration_type", "1", "(Integer) Type of registration: 1 - Open; 2 - Tokenized;");
INSERT INTO `configuration` (field, value, description) VALUES("registration_players", "3", "(Integer) Number of players per team");
INSERT INTO `configuration` (field, value, description) VALUES("registration_facebook", "0", "(Boolean) Allow Facebook Registration");
INSERT INTO `configuration` (field, value, description) VALUES("registration_google", "0", "(Boolean) Allow Google Registration");
INSERT INTO `configuration` (field, value, description) VALUES("registration_prefix", "Hacker", "(String) Automated Team Registation Name Prefix");
INSERT INTO `configuration` (field, value, description) VALUES("ldap", "0", "(Boolean) Ability to use LDAP to login");
INSERT INTO `configuration` (field, value, description) VALUES("ldap_server", "ldap://localhost", "(String) LDAP Server");
INSERT INTO `configuration` (field, value, description) VALUES("ldap_port", "389", "(Integer) LDAP Port");
INSERT INTO `configuration` (field, value, description) VALUES("ldap_domain_suffix", "@localhost", "(String) LDAP Domain");
INSERT INTO `configuration` (field, value, description) VALUES("login", "1", "(Boolean) Ability to login");
INSERT INTO `configuration` (field, value, description) VALUES("login_select", "0", "(Boolean) Login selecting the team");
INSERT INTO `configuration` (field, value, description) VALUES("login_strongpasswords", "0", "(Boolean) Enforce using strong passwords");
INSERT INTO `configuration` (field, value, description) VALUES("login_facebook", "0", "(Boolean) Allow Facebook Login");
INSERT INTO `configuration` (field, value, description) VALUES("login_google", "0", "(Boolean) Allow Google Login");
INSERT INTO `configuration` (field, value, description) VALUES("password_type", "1", "(Integer) Type of passwords: See table password_types");
INSERT INTO `configuration` (field, value, description) VALUES("default_bonus", "30", "(Integer) Default value for bonus in levels");
INSERT INTO `configuration` (field, value, description) VALUES("default_bonusdec", "10", "(Integer) Default bonus decrement in levels");
Expand Down Expand Up @@ -291,12 +321,13 @@ DROP TABLE IF EXISTS `registration_tokens`;
/*!40101 SET character_set_client = utf8 */;
CREATE TABLE `registration_tokens` (
`id` int(11) NOT NULL AUTO_INCREMENT,
`token` text NOT NULL,
`token` varchar(250) NOT NULL,
`used` tinyint(1) NOT NULL,
`team_id` int(11) NOT NULL,
`created_ts` timestamp NOT NULL DEFAULT 0,
`use_ts` timestamp NOT NULL,
PRIMARY KEY (`id`)
PRIMARY KEY (`id`),
KEY `token` (`token`)
) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=latin1;
/*!40101 SET character_set_client = @saved_cs_client */;

Expand All @@ -314,7 +345,9 @@ CREATE TABLE `scores_log` (
`points` int(11) NOT NULL,
`level_id` int(11) NOT NULL,
`type` varchar(4) NOT NULL,
PRIMARY KEY (`id`)
PRIMARY KEY (`id`),
KEY `level_id` (`level_id`),
KEY `team_id` (`team_id`)
) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=latin1;
/*!40101 SET character_set_client = @saved_cs_client */;

Expand All @@ -331,7 +364,8 @@ CREATE TABLE `bases_log` (
`code` int(11) NOT NULL,
`response` text NOT NULL,
`level_id` int(11) NOT NULL,
PRIMARY KEY (`id`)
PRIMARY KEY (`id`),
KEY `level_id` (`level_id`)
) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=latin1;
/*!40101 SET character_set_client = @saved_cs_client */;

Expand All @@ -344,12 +378,16 @@ DROP TABLE IF EXISTS `scripts`;
/*!40101 SET character_set_client = utf8 */;
CREATE TABLE `scripts` (
`id` int(11) NOT NULL AUTO_INCREMENT,
`host` varchar(1024) NOT NULL,
`ts` timestamp NULL,
`pid` int(11) NOT NULL,
`name` text NOT NULL,
`name` varchar(255) NOT NULL,
`cmd` text NOT NULL,
`status` tinyint(1) NOT NULL,
PRIMARY KEY (`id`)
PRIMARY KEY (`id`),
KEY `host` (`host`),
KEY `status` (`status`),
KEY `name` (`name`)
) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=latin1;
/*!40101 SET character_set_client = @saved_cs_client */;

Expand All @@ -366,7 +404,9 @@ CREATE TABLE `failures_log` (
`team_id` int(11) NOT NULL,
`level_id` int(11) NOT NULL,
`flag` text NOT NULL,
PRIMARY KEY (`id`)
PRIMARY KEY (`id`),
KEY `team_id` (`team_id`),
KEY `level_id` (`level_id`)
) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=latin1;
/*!40101 SET character_set_client = @saved_cs_client */;

Expand All @@ -383,7 +423,9 @@ CREATE TABLE `hints_log` (
`level_id` int(11) NOT NULL,
`team_id` int(11) NOT NULL,
`penalty` int(11) NOT NULL,
PRIMARY KEY (`id`)
PRIMARY KEY (`id`),
KEY `level_id` (`level_id`),
KEY `team_id` (`team_id`)
) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=latin1;
/*!40101 SET character_set_client = @saved_cs_client */;

Expand Down
Loading