projects
/
PHP-P10.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
6149853
)
fixed possible empty channel bursts
author
pk910
<philipp@zoelle1.de>
Tue, 16 Aug 2011 23:05:45 +0000
(
01:05
+0200)
committer
pk910
<philipp@zoelle1.de>
Tue, 16 Aug 2011 23:05:45 +0000
(
01:05
+0200)
Uplink/Uplink.class.php
patch
|
blob
|
history
diff --git
a/Uplink/Uplink.class.php
b/Uplink/Uplink.class.php
index e2c2c03cbef4ddb3c538c26682cccfcbc8bb049b..5f2cdf1658237ca75adbdb6af51c04515cc9dc82 100644
(file)
--- a/
Uplink/Uplink.class.php
+++ b/
Uplink/Uplink.class.php
@@
-417,7
+417,6
@@
class Uplink {
$channel->setCreateTime($create_time);
$modes = $channel->getModes();
$userstr = $args[count($args)-1];
$channel->setCreateTime($create_time);
$modes = $channel->getModes();
$userstr = $args[count($args)-1];
- $modeparamcount = count($args)-3;
if($userstr[0] == "%") {
//ban list
$banlist = explode(" ", substr($userstr, 1));
if($userstr[0] == "%") {
//ban list
$banlist = explode(" ", substr($userstr, 1));
@@
-425,10
+424,8
@@
class Uplink {
//TODO: save bans
}
$userstr = $args[count($args)-2];
//TODO: save bans
}
$userstr = $args[count($args)-2];
- $modeparamcount--;
}
if($userstr[0] == "+") { //MODE String
}
if($userstr[0] == "+") { //MODE String
- $modeparamcount++;
$userstr = "";
}
$users = explode(",",$userstr);
$userstr = "";
}
$users = explode(",",$userstr);
@@
-437,8
+434,8
@@
class Uplink {
if($user == "") continue;
$uexp = explode(":", $user);
if(strlen($uexp[0]) != 5) {
if($user == "") continue;
$uexp = explode(":", $user);
if(strlen($uexp[0]) != 5) {
- trigger_error("burst parse error: '".$uexp[0]."' is not an user numeric.", E_USER_
ERROR
);
-
return
;
+ trigger_error("burst parse error: '".$uexp[0]."' is not an user numeric.", E_USER_
WARNING
);
+
break
;
}
if(count($uexp) > 1) {
$isop = false;
}
if(count($uexp) > 1) {
$isop = false;
@@
-457,7
+454,7
@@
class Uplink {
if($this->eventHandler)
$this->eventHandler->event_join($user, $channel, true);
}
if($this->eventHandler)
$this->eventHandler->event_join($user, $channel, true);
}
- $modes->parseModes(implode(" ", array_slice($args, 2
, $modeparamcount
)));
+ $modes->parseModes(implode(" ", array_slice($args, 2)));
}
private function recv_join($from, $args) {
}
private function recv_join($from, $args) {