7 config/testswarm-sample.ini
View file
@@ -154,3 +154,10 @@ password = "root"

;php_error_reporting = 0
; If enabled, php errors of all levels will be shown

;db_log_queries = 0
; If enabled, the Database class will log all queries and the Page class will
; output them at the bottom of the HTML. In order to use this for Api responses,
; use api?format=debug which uses a Page as container. Be careful not to use this
; on a production site as this will show raw queries in HTML and could potentially
; contain information that users should not be able to see.
22 config/testswarm.sql
View file
@@ -8,8 +8,8 @@ CREATE TABLE `clients` (
`useragent_id` varchar(40) NOT NULL,
`useragent` tinytext NOT NULL,
`ip` varchar(15) NOT NULL default '',
`updated` binary(14) NOT NULL default '19700101000000',
`created` binary(14) NOT NULL default '19700101000000',
`updated` binary(14) NOT NULL,
`created` binary(14) NOT NULL,
PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;

@@ -23,8 +23,7 @@ CREATE TABLE `jobs` (
`id` int(11) NOT NULL auto_increment,
`user_id` int(11) NOT NULL default '0',
`name` varchar(255) NOT NULL default '',
`updated` binary(14) NOT NULL default '19700101000000',
`created` binary(14) NOT NULL default '19700101000000',
`created` binary(14) NOT NULL,
PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;

@@ -42,8 +41,8 @@ CREATE TABLE `run_client` (
`error` int(11) NOT NULL default '0',
`total` int(11) NOT NULL default '0',
`results` text NOT NULL,
`updated` binary(14) NOT NULL default '19700101000000',
`created` binary(14) NOT NULL default '19700101000000',
`updated` binary(14) NOT NULL,
`created` binary(14) NOT NULL,
PRIMARY KEY (`run_id`,`client_id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;

@@ -60,8 +59,8 @@ CREATE TABLE `run_useragent` (
`max` int(11) NOT NULL default '1',
`completed` int(11) NOT NULL default '0',
`status` tinyint(4) NOT NULL default '0',
`updated` binary(14) NOT NULL default '19700101000000',
`created` binary(14) NOT NULL default '19700101000000',
`updated` binary(14) NOT NULL,
`created` binary(14) NOT NULL,
PRIMARY KEY (`run_id`,`useragent_id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;

@@ -76,8 +75,7 @@ CREATE TABLE `runs` (
`job_id` int(11) NOT NULL default '0',
`name` varchar(255) NOT NULL default '',
`url` tinytext NOT NULL,
`updated` binary(14) NOT NULL default '19700101000000',
`created` binary(14) NOT NULL default '19700101000000',
`created` binary(14) NOT NULL,
PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;

@@ -90,8 +88,8 @@ CREATE TABLE `runs` (
CREATE TABLE `users` (
`id` int(11) NOT NULL auto_increment,
`name` varchar(255) NOT NULL,
`updated` binary(14) NOT NULL default '19700101000000',
`created` binary(14) NOT NULL default '19700101000000',
`updated` binary(14) NOT NULL,
`created` binary(14) NOT NULL,
`seed` varchar(40) NOT NULL,
`password` varchar(40) NOT NULL,
`auth` varchar(40) NOT NULL,
154 css/testswarm.css
View file
@@ -1,3 +1,44 @@
@-o-keyframes rotate {
from {
-o-transform: rotate(0deg);
}
to {
-o-transform: rotate(360deg);
}
}
@-ms-keyframes rotate {
from {
-ms-transform: rotate(0deg);
}
to {
-ms-transform: rotate(360deg);
}
}
@-moz-keyframes rotate {
from {
-moz-transform: rotate(0deg);
}
to {
-moz-transform: rotate(360deg);
}
}
@-webkit-keyframes rotate {
from {
-webkit-transform: rotate(0deg);
}
to {
-webkit-transform: rotate(360deg);
}
}
@keyframes rotate {
from {
transform: rotate(0deg);
}
to {
transform: rotate(360deg);
}
}

.swarm-browseronline {
position: relative;
text-align: center;
@@ -24,52 +65,109 @@
cursor: default;
}

/* Result table */
/**
* Results table.
* The swarm-status colors are now all derived from the following greens:
* #DBEFD7 (bg) / #468847 (text). The derived colors are calculated using
* HSL, and for clarity I've included those so that it's easy to update the
* saturation/lightness later. However due to browser support I the CSS
* properties are set to the HEX verions.
*
* background: hsl(H.., 44%, 89%)
* color: hsl(H.., 32%, 40%)
* -
* new: hsl(0, 0%, 91%) / hsl(0, 0%, 40%)
* progress: hsl(49, 44%, 89%) / hsl(49, 32%, 40%)
* passed: hsl(110, 44%, 89%) / hsl(110, 32%, 40%)
* failure, timedout
* and error: hsl(0, 44%, 89%) / hsl(0, 32%, 40%)
*/

table.swarm-results th,
table.swarm-results td {
table.swarm-results thead th,
table.swarm-results tbody td.swarm-status {
text-align: center;
background: #fff;
}

table.swarm-results img.swarm-browsericon {
table.swarm-results th img.swarm-browsericon {
max-height: 28px;
}

table.swarm-results td.status-new,
table.swarm-results tr:hover td.status-new {
background: #F2F2F2;
table.swarm-results tbody td.swarm-status {
font-weight: bold;
}

table.swarm-results td.status-progress,
table.swarm-results tr:hover td.status-progress {
background: #FBEED5;
table.swarm-results tbody td.swarm-status-new {
background: #E8E8E8;
}
table.swarm-results tbody td.swarm-status-new,
table.swarm-results tbody td.swarm-status-new a {
color: #666);
}

table.swarm-results td.status-passed,
table.swarm-results tr:hover td.status-passed {
background: #DFF0D8;
table.swarm-results tbody td.swarm-status-progress {
background: #EFEBD7;
}

table.swarm-results td.status-failed,
table.swarm-results tr:hover td.status-failed {
background: #F2DEDE;
table.swarm-results tbody td.swarm-status-progress,
table.swarm-results tbody td.swarm-status-progress a {
color: #877B45;
}

table.swarm-results td.status-timedout,
table.swarm-results td.status-error,
table.swarm-results tr:hover td.status-timedout,
table.swarm-results tr:hover td.status-error {
background: #B94A48;
table.swarm-results tbody td.swarm-status-passed {
background: #DBEFD7;
}
table.swarm-results tbody td.swarm-status-passed,
table.swarm-results tbody td.swarm-status-passed a {
color: #508745;
}

table.swarm-results td.status-timedout a,
table.swarm-results td.status-error a,
table.swarm-results tr:hover td.status-timedout a,
table.swarm-results tr:hover td.status-error a {
color: black;
table.swarm-results tbody td.swarm-status-timedout,
table.swarm-results tbody td.swarm-status-error,
table.swarm-results tbody td.swarm-status-failed {
background: #EFD7D7;
}
table.swarm-results tbody td.swarm-status-timedout,
table.swarm-results tbody td.swarm-status-timedout a,
table.swarm-results tbody td.swarm-status-error,
table.swarm-results tbody td.swarm-status-error a,
table.swarm-results tbody td.swarm-status-failed,
table.swarm-results tbody td.swarm-status-failed a {
color: #874545);
}

table.swarm-results td.status-notscheduled,
table.swarm-results tr:hover td.status-notscheduled {
table.swarm-results tbody td.swarm-status-notscheduled {
background: #fff;
}

.swarm-status-progressicon {
-o-animation-name: rotate;
-o-animation-direction: normal;
-o-animation-duration: 2s;
-o-animation-timing-function: linear;
-o-animation-iteration-count: infinite;

-ms-animation-name: rotate;
-ms-animation-direction: normal;
-ms-animation-duration: 2s;
-ms-animation-timing-function: linear;
-ms-animation-iteration-count: infinite;

-moz-animation-name: rotate;
-moz-animation-direction: normal;
-moz-animation-duration: 2s;
-moz-animation-timing-function: linear;
-moz-animation-iteration-count: infinite;

-webkit-animation-name: rotate;
-webkit-animation-direction: normal;
-webkit-animation-duration: 2s;
-webkit-animation-timing-function: linear;
-webkit-animation-iteration-count: infinite;

animation-name: rotate;
animation-direction: normal;
animation-duration: 2s;
animation-timing-function: linear;
animation-iteration-count: infinite;
}
13 inc/Client.php
View file
@@ -53,7 +53,11 @@ protected function loadFromID( $clientID ) {

// Update its record so that we know that it's still alive
$db->query(str_queryf(
"UPDATE clients SET updated = %s WHERE id = %u LIMIT 1;",
"UPDATE clients
SET
updated = %s
WHERE id = %u
LIMIT 1;",
$clientRow->updated,
$clientRow->id
));
@@ -99,7 +103,7 @@ protected function loadNew() {
// If the user doesn't have one, create a new user row for this name
if ( !$userRow || !$userRow->id ) {
$db->query(str_queryf(
"INSERT INTO users (name, created, updated, seed) VALUES(%s, %s, %s, RAND());",
"INSERT INTO users (name, updated, created) VALUES(%s, %s, %s);",
$username,
swarmdb_dateformat( SWARM_NOW ),
swarmdb_dateformat( SWARM_NOW )
@@ -112,12 +116,13 @@ protected function loadNew() {

// Insert in a new record for the client and get its ID
$db->query(str_queryf(
"INSERT INTO clients (user_id, useragent_id, useragent, ip, created)
VALUES(%u, %s, %s, %s, %s);",
"INSERT INTO clients (user_id, useragent_id, useragent, ip, updated, created)
VALUES(%u, %s, %s, %s, %s, %s);",
$userRow->id,
$browserInfo->getSwarmUaID(),
$browserInfo->getRawUA(),
$request->getIP(),
swarmdb_dateformat( SWARM_NOW ),
swarmdb_dateformat( SWARM_NOW )
));