wamo/gnu-social
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge in Phergie fixes and remove some whitespace

Browse Source
This commit is contained in:
Luke Fitzgerald 2010-07-27 09:14:07 -07:00
parent 3c1d7d81cf
commit dd882be803
4 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
plugins/Irc/extlib/phergie/Phergie/Driver/Streams.php
View File

@ -219,6 +219,14 @@ class Phergie_Driver_Streams extends Phergie_Driver_Abstract
*/ */
public function getEvent() public function getEvent()
{ {
// Check the socket is still active
if (feof($this->socket)) {
throw new Phergie_Driver_Exception(
'EOF detected on socket',
Phergie_Driver_Exception::ERR_CONNECTION_READ_FAILED
);
}
// Check for a new event on the current connection // Check for a new event on the current connection
$buffer = fgets($this->socket, 512); $buffer = fgets($this->socket, 512);
if ($buffer === false) { if ($buffer === false) {

17
plugins/Irc/extlib/phergie/Phergie/Plugin/Cookie/db.php
View File

@ -35,15 +35,24 @@ $xpath = new DOMXPath($doc);
$cookies = $xpath->query('//table[@width="90%"]/tr/td[1]/a'); $cookies = $xpath->query('//table[@width="90%"]/tr/td[1]/a');
foreach ($cookies as $cookie) { foreach ($cookies as $cookie) {
$name = $cookie->textContent;
$name = str_replace(array('(',')',"\n", 'cookies'), array('','', ' ', 'cookie' ), trim( $cookie->textContent)); foreach (range(0, mb_strlen($name) - 1) as $index) {
echo mb_strcut($name, $index, 1), PHP_EOL;
}
$name = str_replace(
array('(',')',"\n", 'cookies'),
array('','', ' ', 'cookie'),
$name
);
$name = iconv('UTF-8', 'ISO-8859-1//TRANSLIT', $name);
$name = trim($name);
$name = rtrim($name, 's');
$link = 'http://en.wikipedia.org' . $cookie->getAttribute('href'); $link = 'http://en.wikipedia.org' . $cookie->getAttribute('href');
$insert->execute(array($name, $link)); $insert->execute(array($name, $link));
print 'added ['.$name.'] -> '. $link . PHP_EOL; echo 'added [' . $name . '] -> '. $link . PHP_EOL;
} }
// Clean up // Clean up
echo 'Cleaning up', PHP_EOL; echo 'Cleaning up', PHP_EOL;
unlink($file); unlink($file);

BIN
plugins/Irc/extlib/phergie/Phergie/Plugin/Tld/db.php
View File

Binary file not shown.

2
plugins/Irc/ircmanager.php
View File

@ -64,8 +64,6 @@ class IrcManager extends ImManager {
} }
} }
/** /**
* Idle processing for io manager's execution loop. * Idle processing for io manager's execution loop.
* Send keepalive pings to server. * Send keepalive pings to server.