Response Header: $header
"); - } elseif(empty($options['returnResponse'])) { + } elseif (empty($options['returnResponse'])) { header($header); } @@ -183,7 +183,7 @@ public static function relayRequest($options) if (!empty($options['debug'])) { print('');
print_r(curl_getinfo($ch));
- print('');
+ print('');
print(''.var_export(curl_error($ch), true).''); print('
');
diff --git a/php-bootstrap/lib/Site.class.php b/php-bootstrap/lib/Site.class.php
index a6c4b29..1f0ccc1 100644
--- a/php-bootstrap/lib/Site.class.php
+++ b/php-bootstrap/lib/Site.class.php
@@ -93,7 +93,7 @@ public static function initialize($rootPath, $hostname = null)
// set useful transaction name and metadata for newrelic
if (extension_loaded('newrelic')) {
- newrelic_name_transaction(static::getConfig('handle') . '/' . implode('/', site::$requestPath));
+ newrelic_name_transaction(static::getConfig('handle').'/'.implode('/', site::$requestPath));
if (isset($_SERVER['QUERY_STRING'])) {
newrelic_add_custom_parameter('request.query', $_SERVER['QUERY_STRING']);
@@ -167,7 +167,7 @@ public static function handleRequest()
if (isset($_SERVER['HTTP_ORIGIN'])) {
$hostname = strtolower(parse_url($_SERVER['HTTP_ORIGIN'], PHP_URL_HOST));
if ($hostname == strtolower(static::$hostname) || static::$permittedOrigins == '*' || in_array($hostname, static::$permittedOrigins)) {
- header('Access-Control-Allow-Origin: ' . $_SERVER['HTTP_ORIGIN']);
+ header('Access-Control-Allow-Origin: '.$_SERVER['HTTP_ORIGIN']);
header('Access-Control-Allow-Credentials: true');
//header('Access-Control-Max-Age: 86400')
} else {
@@ -177,10 +177,10 @@ public static function handleRequest()
}
if ($_SERVER['REQUEST_METHOD'] == 'OPTIONS' && isset($_SERVER['HTTP_ACCESS_CONTROL_REQUEST_METHOD'])) {
- header('Access-Control-Allow-Methods: ' . $_SERVER['HTTP_ACCESS_CONTROL_REQUEST_METHOD']);
+ header('Access-Control-Allow-Methods: '.$_SERVER['HTTP_ACCESS_CONTROL_REQUEST_METHOD']);
if (isset($_SERVER['HTTP_ACCESS_CONTROL_REQUEST_HEADERS'])) {
- header('Access-Control-Allow-Headers: ' . $_SERVER['HTTP_ACCESS_CONTROL_REQUEST_HEADERS']);
+ header('Access-Control-Allow-Headers: '.$_SERVER['HTTP_ACCESS_CONTROL_REQUEST_HEADERS']);
}
exit();
@@ -317,7 +317,7 @@ public static function getRequestPathResult($path)
// if path component doesn't already end in .php, check for a .php match first
if (substr($handle, -4) != '.php') {
- array_push($searchPath, $handle . '.php');
+ array_push($searchPath, $handle.'.php');
$foundNode = static::resolvePath($searchPath);
// printf("\t\t%s\t%s\n", $foundNode ? 'matched' : 'missed', implode('/', $searchPath));
array_pop($searchPath);
@@ -456,7 +456,7 @@ class_exists($className, false)
if ($lastNsPos = strrpos($className, '\\')) {
$namespace = substr($className, 0, $lastNsPos);
$className = substr($className, $lastNsPos + 1);
- $fileName = str_replace('\\', DIRECTORY_SEPARATOR, $namespace) . DIRECTORY_SEPARATOR;
+ $fileName = str_replace('\\', DIRECTORY_SEPARATOR, $namespace).DIRECTORY_SEPARATOR;
} else {
$fileName = '';
}
@@ -497,7 +497,7 @@ class_exists($className, false)
public static function loadConfig($className)
{
- $cacheKey = 'class-config:' . $className;
+ $cacheKey = 'class-config:'.$className;
if (!$configFileIds = Cache::fetch($cacheKey)) {
@@ -508,7 +508,7 @@ public static function loadConfig($className)
if ($lastNsPos = strrpos($className, '\\')) {
$namespace = substr($className, 0, $lastNsPos);
$className = substr($className, $lastNsPos + 1);
- $path = str_replace('\\', DIRECTORY_SEPARATOR, $namespace) . DIRECTORY_SEPARATOR;
+ $path = str_replace('\\', DIRECTORY_SEPARATOR, $namespace).DIRECTORY_SEPARATOR;
} else {
$path = '';
}
@@ -716,18 +716,18 @@ public static function redirect($path, $get = false, $hash = false)
if (preg_match('/^https?:\/\//i', $path)) {
$url = $path;
} else {
- $url = ($_SERVER['HTTPS'] ? 'https' : 'http') . '://' . static::$hostname . '/' . ltrim($path, '/');
+ $url = ($_SERVER['HTTPS'] ? 'https' : 'http').'://'.static::$hostname.'/'.ltrim($path, '/');
}
if ($get) {
- $url .= '?' . (is_array($get) ? http_build_query($get) : $get);
+ $url .= '?'.(is_array($get) ? http_build_query($get) : $get);
}
if ($hash) {
- $url .= '#' . $hash;
+ $url .= '#'.$hash;
}
- header('Location: ' . $url);
+ header('Location: '.$url);
exit();
}
@@ -780,12 +780,12 @@ public static function getVersionedRootUrl($path)
$fsPath = $path;
array_unshift($fsPath, 'site-root');
- $url = '/' . implode('/', $path);
+ $url = '/'.implode('/', $path);
$Node = static::resolvePath($fsPath);
if ($Node) {
- return $url . '?_sha1=' . $Node->SHA1;
+ return $url.'?_sha1='.$Node->SHA1;
} else {
return $url;
}
diff --git a/php-bootstrap/lib/SiteCollection.class.php b/php-bootstrap/lib/SiteCollection.class.php
index 157713a..7dfb4fe 100644
--- a/php-bootstrap/lib/SiteCollection.class.php
+++ b/php-bootstrap/lib/SiteCollection.class.php
@@ -25,10 +25,9 @@ public function __construct($handle, $record = null)
if (static::$autoCreate) {
$this->_record = static::createRecord($handle);
} else {
- throw new Exception('Collection with name ' . $handle . ' could not be located');
+ throw new Exception('Collection with name '.$handle.' could not be located');
}
}
-
}
public function __get($name)
@@ -73,12 +72,12 @@ public static function getCacheKey($handle, $parentID = null, $remote = false)
$cacheKey .= sprintf('/%s/', $remote ? 'remote' : 'local');
}
- return $cacheKey . $handle;
+ return $cacheKey.$handle;
}
public static function getByID($collectionID)
{
- $cacheKey = 'efs:col:' . $collectionID;
+ $cacheKey = 'efs:col:'.$collectionID;
if (false === ($record = Cache::fetch($cacheKey))) {
$record = DB::oneRecord(
diff --git a/php-bootstrap/lib/SiteFile.class.php b/php-bootstrap/lib/SiteFile.class.php
index ab14eac..65dac10 100644
--- a/php-bootstrap/lib/SiteFile.class.php
+++ b/php-bootstrap/lib/SiteFile.class.php
@@ -106,7 +106,7 @@ public static function getCacheKey($collectionID, $handle)
public static function getByID($fileID)
{
- $cacheKey = 'efs:file:' . $fileID;
+ $cacheKey = 'efs:file:'.$fileID;
if (false === ($record = Cache::fetch($cacheKey))) {
$record = DB::oneRecord(
@@ -211,7 +211,7 @@ public function getFullPath($root = null, $prependParent = true)
public static function getRealPathByID($ID)
{
- return Site::$rootPath . '/' . static::$dataPath . '/' . $ID;
+ return Site::$rootPath.'/'.static::$dataPath.'/'.$ID;
}
public function getName()
@@ -273,7 +273,7 @@ public static function create($collectionID, $handle, $data = null, $ancestorID
return $record;
}
- function put($data, $ancestorID = null)
+ public function put($data, $ancestorID = null)
{
$record = null;
$tempPath = tempnam(static::getRealPathByID(''), 'uploading');
@@ -512,7 +512,7 @@ public function outputAsResponse($includeAuthor = false)
if (!empty($_GET['_sha1']) && $_GET['_sha1'] == $this->SHA1) {
$expires = 60*60*24*365;
header('Cache-Control: public, max-age='.$expires);
- header('Expires: ' . gmdate('D, d M Y H:i:s \G\M\T', time()+$expires));
+ header('Expires: '.gmdate('D, d M Y H:i:s \G\M\T', time()+$expires));
header('Pragma: public');
}
@@ -530,7 +530,7 @@ public function outputAsResponse($includeAuthor = false)
header('Last-Modified: '.gmdate('D, d M Y H:i:s \G\M\T', $this->Timestamp));
if ($includeAuthor && $this->Author) {
- header('Author: '.$this->Author->EmailRecipient);
+ header('Author: '.$this->Author->EmailRecipient);
}
readfile($this->RealPath);
diff --git a/php-bootstrap/mail.php b/php-bootstrap/mail.php
index 92cffbe..caa76f4 100644
--- a/php-bootstrap/mail.php
+++ b/php-bootstrap/mail.php
@@ -1,7 +1,7 @@