Skip to content

Commit

Permalink
Convert to mysqli
Browse files Browse the repository at this point in the history
  • Loading branch information
@nicjansma
nicjansma committed Jan 12, 2017
1 parent 81e3426 commit fea7d74
Show file tree
Hide file tree
Showing 30 changed files with 497 additions and 492 deletions.
16 changes: 8 additions & 8 deletions all.php
View file
Expand Up @@ -5,7 +5,7 @@

$searchstring = null;
if (array_key_exists('search', $_GET) && trim($_GET['search']) != '') {
$searchstring = "urls.url LIKE '%".mysql_real_escape_string(trim($_GET['search']))."%'";
$searchstring = "urls.url LIKE '%".mysqli_real_escape_string($conn, trim($_GET['search']))."%'";

$current_user = User::get();
if (!is_null($current_user)) {
Expand Down Expand Up @@ -137,7 +137,7 @@
} else {
$subsetstring .= ' OR ';
}
$subsetstring .= "urls.url LIKE '".mysql_real_escape_string($url)."%'";
$subsetstring .= "urls.url LIKE '".mysqli_real_escape_string($conn, $url)."%'";
}
}

Expand All @@ -158,8 +158,8 @@
$query .= " AND $searchstring";
}

$result = mysql_query($query);
$row = mysql_fetch_row($result);
$result = mysqli_query($conn, $query);
$row = mysqli_fetch_row($result);
$total = $row[0];

$pages = new Paginator();
Expand Down Expand Up @@ -188,18 +188,18 @@

$query .= sprintf(" ORDER BY url LIMIT %d OFFSET %d", $perPage, $offset);

$result = mysql_query($query);
$result = mysqli_query($conn, $query);

if (!$result) {
error_log(mysql_error());
error_log(mysqli_error($conn));
}

$yslow = false;
$pagespeed = false;
$dynatrace = false;

$rows = array();
while ($row = mysql_fetch_assoc($result)) {
while ($row = mysqli_fetch_assoc($result)) {
$rows[] = $row;

if ($enabledMetrics['yslow'] && !$yslow && !is_null($row['o'])) {
Expand Down Expand Up @@ -264,7 +264,7 @@
</tr><?php
}

mysql_free_result($result);
mysqli_free_result($result);
?>
</table>
<?php
Expand Down
36 changes: 18 additions & 18 deletions beacon/dommonster/index.php
View file
@@ -1,18 +1,18 @@
<?php
<?php
require_once(dirname(dirname(dirname(__FILE__))).'/global.php');

function updateUrlAggregates($url_id, $measurement_id)
{
# updating latest values for the URL
$query = sprintf("UPDATE urls SET dommonster_last_id = %d, last_update = now() WHERE id = %d",
mysql_real_escape_string($measurement_id),
mysql_real_escape_string($url_id)
mysqli_real_escape_string($conn, $measurement_id),
mysqli_real_escape_string($conn, $url_id)
);

$result = mysql_query($query);
$result = mysqli_query($conn, $query);

if (!$result) {
beaconError(mysql_error());
beaconError(mysqli_error($conn));
}
}

Expand Down Expand Up @@ -50,24 +50,24 @@ function updateUrlAggregates($url_id, $measurement_id)
'%d',
'%d'
)",
mysql_real_escape_string(array_key_exists('version', $_POST) ? $_POST['version'] : null),
mysql_real_escape_string($url_id),
mysql_real_escape_string(array_key_exists('elements', $stats) ? $stats['elements'] : null),
mysql_real_escape_string(array_key_exists('nodecount', $stats) ? $stats['nodecount'] : null),
mysql_real_escape_string(array_key_exists('textnodes', $stats) ? $stats['textnodes'] : null),
mysql_real_escape_string(array_key_exists('textnodessize', $stats) ? $stats['textnodessize'] : null),
mysql_real_escape_string(array_key_exists('contentpercent', $stats) ? $stats['contentpercent'] : null),
mysql_real_escape_string(array_key_exists('average', $stats) ? $stats['average'] : null),
mysql_real_escape_string(array_key_exists('domsize', $stats) ? $stats['domsize'] : null),
mysql_real_escape_string(array_key_exists('bodycount', $stats) ? $stats['bodycount']*1000 : null)
mysqli_real_escape_string($conn, array_key_exists('version', $_POST) ? $_POST['version'] : null),
mysqli_real_escape_string($conn, $url_id),
mysqli_real_escape_string($conn, array_key_exists('elements', $stats) ? $stats['elements'] : null),
mysqli_real_escape_string($conn, array_key_exists('nodecount', $stats) ? $stats['nodecount'] : null),
mysqli_real_escape_string($conn, array_key_exists('textnodes', $stats) ? $stats['textnodes'] : null),
mysqli_real_escape_string($conn, array_key_exists('textnodessize', $stats) ? $stats['textnodessize'] : null),
mysqli_real_escape_string($conn, array_key_exists('contentpercent', $stats) ? $stats['contentpercent'] : null),
mysqli_real_escape_string($conn, array_key_exists('average', $stats) ? $stats['average'] : null),
mysqli_real_escape_string($conn, array_key_exists('domsize', $stats) ? $stats['domsize'] : null),
mysqli_real_escape_string($conn, array_key_exists('bodycount', $stats) ? $stats['bodycount']*1000 : null)
);

if (!mysql_query($query))
if (!mysqli_query($conn, $query))
{
beaconError(mysql_error());
beaconError(mysqli_error($conn));
}

updateUrlAggregates($url_id, mysql_insert_id());
updateUrlAggregates($url_id, mysqli_insert_id($conn));

$url = validateURL($_POST['url']);
?><html><head><script>
Expand Down
52 changes: 26 additions & 26 deletions beacon/dynatrace/index.php
View file
Expand Up @@ -5,14 +5,14 @@ function updateUrlAggregates($url_id, $measurement_id)
{
# updating latest values for the URL
$query = sprintf("UPDATE urls SET dynatrace_last_id = %d, last_update = now(), dt_refresh_request = 0 WHERE id = %d",
mysql_real_escape_string($measurement_id),
mysql_real_escape_string($url_id)
mysqli_real_escape_string($conn, $measurement_id),
mysqli_real_escape_string($conn, $url_id)
);

$result = mysql_query($query);
$result = mysqli_query($conn, $query);

if (!$result) {
beaconError(mysql_error());
beaconError(mysqli_error($conn));
}
}

Expand Down Expand Up @@ -59,33 +59,33 @@ function updateUrlAggregates($url_id, $measurement_id)
'%d', '%d', '%d',
'%s'
)",
mysql_real_escape_string(array_key_exists('version', $post) ? $post['version'] : null),
mysql_real_escape_string($url_id),
mysql_real_escape_string($post['rank']),
mysql_real_escape_string($cache),
mysql_real_escape_string($net),
mysql_real_escape_string($server),
mysql_real_escape_string($js),
mysql_real_escape_string(array_key_exists('timetoimpression', $post) ? $post['timetoimpression'] : null),
mysql_real_escape_string(array_key_exists('timetoonload', $post) ? $post['timetoonload'] : null),
mysql_real_escape_string(array_key_exists('timetofullload', $post) ? $post['timetofullload'] : null),
mysql_real_escape_string(array_key_exists('reqnumber', $post) ? $post['reqnumber'] : null),
mysql_real_escape_string(array_key_exists('xhrnumber', $post) ? $post['xhrnumber'] : null),
mysql_real_escape_string(array_key_exists('pagesize', $post) ? $post['pagesize'] : null),
mysql_real_escape_string(array_key_exists('cachablesize', $post) ? $post['cachablesize'] : null),
mysql_real_escape_string(array_key_exists('noncachablesize', $post) ? $post['noncachablesize'] : null),
mysql_real_escape_string(array_key_exists('timeonnetwork', $post) ? $post['timeonnetwork'] : null),
mysql_real_escape_string(array_key_exists('timeinjs', $post) ? $post['timeinjs'] : null),
mysql_real_escape_string(array_key_exists('timeinrendering', $post) ? $post['timeinrendering'] : null),
mysql_real_escape_string($post_data)
mysqli_real_escape_string($conn, array_key_exists('version', $post) ? $post['version'] : null),
mysqli_real_escape_string($conn, $url_id),
mysqli_real_escape_string($conn, $post['rank']),
mysqli_real_escape_string($conn, $cache),
mysqli_real_escape_string($conn, $net),
mysqli_real_escape_string($conn, $server),
mysqli_real_escape_string($conn, $js),
mysqli_real_escape_string($conn, array_key_exists('timetoimpression', $post) ? $post['timetoimpression'] : null),
mysqli_real_escape_string($conn, array_key_exists('timetoonload', $post) ? $post['timetoonload'] : null),
mysqli_real_escape_string($conn, array_key_exists('timetofullload', $post) ? $post['timetofullload'] : null),
mysqli_real_escape_string($conn, array_key_exists('reqnumber', $post) ? $post['reqnumber'] : null),
mysqli_real_escape_string($conn, array_key_exists('xhrnumber', $post) ? $post['xhrnumber'] : null),
mysqli_real_escape_string($conn, array_key_exists('pagesize', $post) ? $post['pagesize'] : null),
mysqli_real_escape_string($conn, array_key_exists('cachablesize', $post) ? $post['cachablesize'] : null),
mysqli_real_escape_string($conn, array_key_exists('noncachablesize', $post) ? $post['noncachablesize'] : null),
mysqli_real_escape_string($conn, array_key_exists('timeonnetwork', $post) ? $post['timeonnetwork'] : null),
mysqli_real_escape_string($conn, array_key_exists('timeinjs', $post) ? $post['timeinjs'] : null),
mysqli_real_escape_string($conn, array_key_exists('timeinrendering', $post) ? $post['timeinrendering'] : null),
mysqli_real_escape_string($conn, $post_data)
);

if (!mysql_query($query))
if (!mysqli_query($conn, $query))
{
beaconError(mysql_error());
beaconError(mysqli_error($conn));
}

updateUrlAggregates($url_id, mysql_insert_id());
updateUrlAggregates($url_id, mysqli_insert_id($conn));
} else {
header('HTTP/1.0 400 Bad Request');

Expand Down
22 changes: 11 additions & 11 deletions beacon/events/index.php
View file
Expand Up @@ -29,27 +29,27 @@
.($end !== FALSE ? ", '%s'" : '')
.($resource_url !== FALSE ? ", '%s'" : '')
.')',
mysql_real_escape_string($url),
mysql_real_escape_string($_GET['title']),
mysql_real_escape_string($start),
mysql_real_escape_string($type),
mysql_real_escape_string($end),
mysql_real_escape_string($resource_url)
mysqli_real_escape_string($conn, $url),
mysqli_real_escape_string($conn, $_GET['title']),
mysqli_real_escape_string($conn, $start),
mysqli_real_escape_string($conn, $type),
mysqli_real_escape_string($conn, $end),
mysqli_real_escape_string($conn, $resource_url)
);

if (!mysql_query($query))
if (!mysqli_query($conn, $query))
{
beaconError(mysql_error());
beaconError(mysqli_error($conn));
}

# updating last_event_update for the matching URLs
$query = sprintf("UPDATE urls SET last_event_update = NOW() WHERE INSTR(url, '%s') = 1",
mysql_real_escape_string($url)
mysqli_real_escape_string($conn, $url)
);
$result = mysql_query($query);
$result = mysqli_query($conn, $query);

if (!$result) {
beaconError(mysql_error());
beaconError(mysqli_error($conn));
}

if (array_key_exists('manual', $_GET))
Expand Down
44 changes: 22 additions & 22 deletions beacon/har/index.php
View file
Expand Up @@ -7,13 +7,13 @@ function updateUrlAggregates($url_id, $measurement_id)

# updating latest values for the URL
$query = sprintf("UPDATE urls SET har_last_id = %d, last_update = now() WHERE id = %d",
mysql_real_escape_string($measurement_id),
mysql_real_escape_string($url_id)
mysqli_real_escape_string($conn, $measurement_id),
mysqli_real_escape_string($conn, $url_id)
);
$result = mysql_query($query);
$result = mysqli_query($conn, $query);

if (!$result) {
beaconError(mysql_error());
beaconError(mysqli_error($conn));
}
}

Expand All @@ -32,27 +32,27 @@ function updateUrlAggregates($url_id, $measurement_id)
{
$query = sprintf("/* HAR link */ INSERT INTO har (timestamp, url_id, link)
VALUES ('%s', '%d', '%s')",
mysql_real_escape_string($_REQUEST['timestamp']),
mysql_real_escape_string($url_id),
mysql_real_escape_string($link)
mysqli_real_escape_string($conn, $_REQUEST['timestamp']),
mysqli_real_escape_string($conn, $url_id),
mysqli_real_escape_string($conn, $link)
);
}
else
{
$query = sprintf("/* HAR link */ INSERT INTO har (url_id, link)
VALUES ('%d', '%s')",
mysql_real_escape_string($url_id),
mysql_real_escape_string($link)
mysqli_real_escape_string($conn, $url_id),
mysqli_real_escape_string($conn, $link)
);
}


if (!mysql_query($query))
if (!mysqli_query($conn, $query))
{
beaconError(mysql_error());
beaconError(mysqli_error($conn));
}

updateUrlAggregates($url_id, mysql_insert_id());
updateUrlAggregates($url_id, mysqli_insert_id($conn));

header('HTTP/1.0 204 Data accepted');
exit;
Expand Down Expand Up @@ -192,29 +192,29 @@ function updateUrlAggregates($url_id, $measurement_id)
{
$query = sprintf("/* HAR POST */ INSERT INTO har (timestamp, url_id, har, compressed)
VALUES ('%s', '%d', '%s', '%d')",
mysql_real_escape_string($_REQUEST['timestamp']),
mysql_real_escape_string($url_id),
mysql_real_escape_string(defined('FORCE_GZIP') ? gzcompress($har_data) : $har_data),
mysql_real_escape_string(defined('FORCE_GZIP') ? 1 : 0)
mysqli_real_escape_string($conn, $_REQUEST['timestamp']),
mysqli_real_escape_string($conn, $url_id),
mysqli_real_escape_string($conn, defined('FORCE_GZIP') ? gzcompress($har_data) : $har_data),
mysqli_real_escape_string($conn, defined('FORCE_GZIP') ? 1 : 0)
);
}
else
{
$query = sprintf("/* HAR POST */ INSERT INTO har (url_id, har, compressed)
VALUES ('%d', '%s', '%d')",
mysql_real_escape_string($url_id),
mysql_real_escape_string(defined('FORCE_GZIP') ? gzcompress($har_data) : $har_data),
mysql_real_escape_string(defined('FORCE_GZIP') ? 1 : 0)
mysqli_real_escape_string($conn, $url_id),
mysqli_real_escape_string($conn, defined('FORCE_GZIP') ? gzcompress($har_data) : $har_data),
mysqli_real_escape_string($conn, defined('FORCE_GZIP') ? 1 : 0)
);
}


if (!mysql_query($query))
if (!mysqli_query($conn, $query))
{
beaconError(mysql_error());
beaconError(mysqli_error($conn));
}

updateUrlAggregates($url_id, mysql_insert_id());
updateUrlAggregates($url_id, mysqli_insert_id($conn));

if (count($HAR_processors)) {
$har_data_parsed = json_decode($har_data, true);
Expand Down
28 changes: 14 additions & 14 deletions beacon/metric/index.php
View file
Expand Up @@ -5,13 +5,13 @@ function updateUrlAggregates($url_id, $measurement_id)
{
# updating latest values for the URL
$query = sprintf("UPDATE urls set metric_last_id = %d, last_update = now() WHERE id = %d",
mysql_real_escape_string($measurement_id),
mysql_real_escape_string($url_id)
mysqli_real_escape_string($conn, $measurement_id),
mysqli_real_escape_string($conn, $url_id)
);
$result = mysql_query($query);
$result = mysqli_query($conn, $query);

if (!$result) {
beaconError(mysql_error());
beaconError(mysqli_error($conn));
}
}

Expand All @@ -27,26 +27,26 @@ function updateUrlAggregates($url_id, $measurement_id)
if (array_key_exists('timestamp', $_REQUEST) && $_REQUEST['timestamp']) {
# adding new entry
$query = sprintf("INSERT INTO metric (timestamp, url_id, metric_id, value) VALUES ('%s', '%d', '%d', '%f')",
mysql_real_escape_string($_REQUEST['timestamp']),
mysql_real_escape_string($url_id),
mysql_real_escape_string($metrics[$_REQUEST['metric']]['id']),
mysql_real_escape_string($_REQUEST['value'])
mysqli_real_escape_string($conn, $_REQUEST['timestamp']),
mysqli_real_escape_string($conn, $url_id),
mysqli_real_escape_string($conn, $metrics[$_REQUEST['metric']]['id']),
mysqli_real_escape_string($conn, $_REQUEST['value'])
);
} else {
# adding new entry
$query = sprintf("INSERT INTO metric (url_id, metric_id, value) VALUES ('%d', '%d', '%f')",
mysql_real_escape_string($url_id),
mysql_real_escape_string($metrics[$_REQUEST['metric']]['id']),
mysql_real_escape_string($_REQUEST['value'])
mysqli_real_escape_string($conn, $url_id),
mysqli_real_escape_string($conn, $metrics[$_REQUEST['metric']]['id']),
mysqli_real_escape_string($conn, $_REQUEST['value'])
);
}

if (!mysql_query($query))
if (!mysqli_query($conn, $query))
{
beaconError(mysql_error());
beaconError(mysqli_error($conn));
}

updateUrlAggregates($url_id, mysql_insert_id());
updateUrlAggregates($url_id, mysqli_insert_id($conn));

header('HTTP/1.0 204 Data accepted');
exit;
Expand Down

0 comments on commit fea7d74

Please sign in to comment.