mbirth/LuckyCoinkydink
Archived
1
0
Fork 0
Code Issues Pull Requests Activity

Small code cleanup by Falk Doering:

Browse Source 
- PHP6 forward compatibility on accessing strings
- Better indenting, other cleanups on the plugin API file
This commit is contained in:
Garvin Hicking
2007-07-17 11:31:20 +00:00
parent 1364313382
commit a8f57711a9
18 changed files with 574 additions and 560 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
bundled-libs/HTTP/Request.php
View File

@ -259,7 +259,7 @@ class HTTP_Request {
$this->_timeout = null;
$this->_response = null;
foreach ($params as $key => $value) {
foreach ($params AS $key => $value) {
$this->{'_' . $key} = $value;
}
@ -483,7 +483,7 @@ class HTTP_Request {
return call_user_func($callback, $value);
} else {
$map = array();
foreach ($value as $k => $v) {
foreach ($value AS $k => $v) {
$map[$k] = $this->_arrayMapRecursive($callback, $v);
}
return $map;
@ -507,7 +507,7 @@ class HTTP_Request {
if (!is_array($fileName) && !is_readable($fileName)) {
return PEAR::raiseError("File '{$fileName}' is not readable");
} elseif (is_array($fileName)) {
foreach ($fileName as $name) {
foreach ($fileName AS $name) {
if (!is_readable($name)) {
return PEAR::raiseError("File '{$name}' is not readable");
}
@ -653,7 +653,7 @@ class HTTP_Request {
$this->_url = &new Net_URL($redirect);
$this->addHeader('Host', $this->_generateHostHeader());
// Absolute path
} elseif ($redirect{0} == '/') {
} elseif ($redirect[0] == '/') {
$this->_url->path = $redirect;
// Relative path
@ -777,7 +777,7 @@ class HTTP_Request {
// Request Headers
if (!empty($this->_requestHeaders)) {
foreach ($this->_requestHeaders as $name => $value) {
foreach ($this->_requestHeaders AS $name => $value) {
$canonicalName = implode('-', array_map('ucfirst', explode('-', $name)));
$request .= $canonicalName . ': ' . $value . "\r\n";
}
@ -805,20 +805,20 @@ class HTTP_Request {
$postdata = '';
if (!empty($this->_postData)) {
$flatData = $this->_flattenArray('', $this->_postData);
foreach ($flatData as $item) {
foreach ($flatData AS $item) {
$postdata .= '--' . $boundary . "\r\n";
$postdata .= 'Content-Disposition: form-data; name="' . $item[0] . '"';
$postdata .= "\r\n\r\n" . urldecode($item[1]) . "\r\n";
}
}
foreach ($this->_postFiles as $name => $value) {
foreach ($this->_postFiles AS $name => $value) {
if (is_array($value['name'])) {
$varname = $name . ($this->_useBrackets? '[]': '');
} else {
$varname = $name;
$value['name'] = array($value['name']);
}
foreach ($value['name'] as $key => $filename) {
foreach ($value['name'] AS $key => $filename) {
$fp = fopen($filename, 'r');
$data = fread($fp, filesize($filename));
fclose($fp);
@ -860,7 +860,7 @@ class HTTP_Request {
return array(array($name, $values));
} else {
$ret = array();
foreach ($values as $k => $v) {
foreach ($values AS $k => $v) {
if (empty($name)) {
$newName = $k;
} elseif ($this->_useBrackets) {
@ -928,7 +928,7 @@ class HTTP_Request {
*/
function _notify($event, $data = null)
{
foreach (array_keys($this->_listeners) as $id) {
foreach (array_keys($this->_listeners) AS $id) {
$this->_listeners[$id]->update($this, $event, $data);
}
}
@ -1183,7 +1183,7 @@ class HTTP_Response
*/
function _notify($event, $data = null)
{
foreach (array_keys($this->_listeners) as $id) {
foreach (array_keys($this->_listeners) AS $id) {
$this->_listeners[$id]->update($this, $event, $data);
}
}

10
bundled-libs/Net/URL.php
View File

@ -166,7 +166,7 @@ class Net_URL
// Default querystring
$this->querystring = array();
foreach ($urlinfo as $key => $value) {
foreach ($urlinfo AS $key => $value) {
switch ($key) {
case 'scheme':
$this->protocol = $value;
@ -181,7 +181,7 @@ class Net_URL
break;
case 'path':
if ($value{0} == '/') {
if ($value[0] == '/') {
$this->path = $value;
} else {
$path = dirname($this->path) == DIRECTORY_SEPARATOR ? '' : dirname($this->path);
@ -272,9 +272,9 @@ class Net_URL
function getQueryString()
{
if (!empty($this->querystring)) {
foreach ($this->querystring as $name => $value) {
foreach ($this->querystring AS $name => $value) {
if (is_array($value)) {
foreach ($value as $k => $v) {
foreach ($value AS $k => $v) {
$querystring[] = $this->useBrackets ? sprintf('%s[%s]=%s', $name, $k, $v) : ($name . '=' . $v);
}
} elseif (!is_null($value)) {
@ -303,7 +303,7 @@ class Net_URL
$parts = preg_split('/[' . preg_quote(ini_get('arg_separator.input'), '/') . ']/', $querystring, -1, PREG_SPLIT_NO_EMPTY);
$return = array();
foreach ($parts as $part) {
foreach ($parts AS $part) {
if (strpos($part, '=') !== false) {
$value = substr($part, strpos($part, '=') + 1);
$key = substr($part, 0, strpos($part, '='));

2
bundled-libs/Text/Wiki/Parse/Default/Wikilink.php
View File

@ -140,7 +140,7 @@ class Text_Wiki_Parse_Wikilink extends Text_Wiki_Parse {
{
// when prefixed with !, it's explicitly not a wiki link.
// return everything as it was.
if ($matches[2]{0} == '!') {
if ($matches[2][0] == '!') {
return $matches[1] . substr($matches[2], 1) . $matches[3];
}

2
bundled-libs/Text/Wiki/Render/Xhtml/Url.php
View File

@ -56,7 +56,7 @@ class Text_Wiki_Render_Xhtml_Url extends Text_Wiki_Render {
} else {
// allow for alternative targets on non-anchor HREFs
if ($href{0} == '#') {
if ($href[0] == '#') {
$target = '';
} else {
$target = $this->getConf('target');

2
bundled-libs/Text/Wiki/Rule/wikilink.php
View File

@ -159,7 +159,7 @@ class Text_Wiki_Rule_wikilink extends Text_Wiki_Rule {
{
// when prefixed with !, it's explicitly not a wiki link.
// return everything as it was.
if ($matches[2]{0} == '!') {
if ($matches[2][0] == '!') {
return $matches[1] . substr($matches[2], 1) . $matches[3];
}