Skip to content
This repository has been archived by the owner on Apr 26, 2023. It is now read-only.

Commit

Permalink
Merge pull request #106 from dasa/spelling
Browse files Browse the repository at this point in the history
Fix spelling.
  • Loading branch information
kellyhutchins committed Apr 14, 2014
2 parents f494df3 + c21779b commit 22c8113
Showing 1 changed file with 8 additions and 11 deletions.
19 changes: 8 additions & 11 deletions PHP/proxy.php
Original file line number Diff line number Diff line change
Expand Up @@ -17,18 +17,19 @@ class Proxy {
*
* @var ProxyConfig
*/

public $proxyConfig;

/**
* Holds the referer assocated with client request
* Holds the referer associated with client request
*
* @var string
*/

public $referer;

/**
* Holds a collection of server urls listed in configution (keys same as keys in config, but lowercase).
* Holds a collection of server urls listed in configuration (keys same as keys in config, but lowercase).
*
* @var array
*/
Expand Down Expand Up @@ -59,7 +60,6 @@ class Proxy {

public $headers;


/**
* cURL resource used to send HTTP requests
*
Expand All @@ -68,9 +68,8 @@ class Proxy {

public $ch;


/**
* Holds the action assocated with the request (post, get)
* Holds the action associated with the request (post, get)
*
* @var string
*/
Expand All @@ -86,7 +85,7 @@ class Proxy {
public $proxyUrl;

/**
* Holds the query string assocated with the request
* Holds the query string associated with the request
*
* @var string
*/
Expand Down Expand Up @@ -149,7 +148,6 @@ class Proxy {

public $sessionUrl;


/**
* Allowed application urls array is just an array of urls
*
Expand All @@ -174,7 +172,6 @@ class Proxy {

public $proxyBody;


/**
* Holds a field to help debug booleans
*
Expand Down Expand Up @@ -410,7 +407,7 @@ public function setProxyHeaders()

}else{

header("Content-Type: text/plain;charset=utf-8"); //If preg_split does not evaulate use text/plain
header("Content-Type: text/plain;charset=utf-8"); //If preg_split does not evaluate use text/plain
}
}

Expand Down Expand Up @@ -856,7 +853,7 @@ public function proxyPost($url, $params)

$this->proxyBody = null;

if(empty($url) || $url == null || empty($params) || $url == $params){ //If no $url or $params passed, defaut to class property values
if(empty($url) || $url == null || empty($params) || $url == $params){ //If no $url or $params passed, default to class property values

$url = $this->proxyUrl;

Expand Down Expand Up @@ -2159,7 +2156,7 @@ public function getDatabaseErrorMessage()

$dbError = array(
"error" => array("code" => 500,
"details" => array("A database error occured. Consider backing up and then deleting sqlite database."),
"details" => array("A database error occurred. Consider backing up and then deleting sqlite database."),
"message" => "Proxy failed due to database error."
));

Expand Down

0 comments on commit 22c8113

Please sign in to comment.