Clean up per PSR2

This commit is contained in:
Zach Borboa
2016-08-24 00:25:38 -07:00
parent 81be853f51
commit 39c21041a5
30 changed files with 355 additions and 216 deletions
+15 -7
View File
@@ -62,7 +62,12 @@ if ($test === 'http_basic_auth') {
if (empty($_SERVER['PHP_AUTH_DIGEST'])) {
header('HTTP/1.1 401 Unauthorized');
header(sprintf(
'WWW-Authenticate: Digest realm="%s", qop="%s", nonce="%s", opaque="%s"', $realm, $qop, $nonce, $opaque));
'WWW-Authenticate: Digest realm="%s", qop="%s", nonce="%s", opaque="%s"',
$realm,
$qop,
$nonce,
$opaque
));
echo 'canceled';
exit;
}
@@ -76,8 +81,12 @@ if ($test === 'http_basic_auth') {
'uri' => '',
'response' => '',
);
preg_match_all('@(' . implode('|', array_keys($data)) . ')=(?:([\'"])([^\2]+?)\2|([^\s,]+))@',
$_SERVER['PHP_AUTH_DIGEST'], $matches, PREG_SET_ORDER);
preg_match_all(
'@(' . implode('|', array_keys($data)) . ')=(?:([\'"])([^\2]+?)\2|([^\s,]+))@',
$_SERVER['PHP_AUTH_DIGEST'],
$matches,
PREG_SET_ORDER
);
foreach ($matches as $match) {
$data[$match['1']] = $match['3'] ? $match['3'] : $match['4'];
}
@@ -85,7 +94,8 @@ if ($test === 'http_basic_auth') {
$A1 = md5($data['username'] . ':' . $realm . ':' . $users[$data['username']]);
$A2 = md5($_SERVER['REQUEST_METHOD'] . ':' . $data['uri']);
$valid_response = md5(
$A1 . ':' . $data['nonce'] . ':' . $data['nc'] . ':' . $data['cnonce'] . ':' . $data['qop'] . ':' . $A2);
$A1 . ':' . $data['nonce'] . ':' . $data['nc'] . ':' . $data['cnonce'] . ':' . $data['qop'] . ':' . $A2
);
if (!($data['response'] === $valid_response)) {
header('HTTP/1.1 401 Unauthorized');
@@ -110,9 +120,7 @@ if ($test === 'http_basic_auth') {
} elseif ($test === 'patch') {
echo $http_raw_post_data;
exit;
} elseif (
$test === 'post_multidimensional' ||
$test === 'post_multidimensional_with_file') {
} elseif ($test === 'post_multidimensional' || $test === 'post_multidimensional_with_file') {
header('Content-Type: application/json');
echo json_encode(array(
'post' => $_POST,