projects
/
PHP-P10.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
don't trigger mode event if mode change is coming from a server
[PHP-P10.git]
/
Uplink
/
Uplink.class.php
diff --git
a/Uplink/Uplink.class.php
b/Uplink/Uplink.class.php
index 5f2cdf1658237ca75adbdb6af51c04515cc9dc82..345ceb8312c25131cc1c0d1f0fd3919ac733767c 100644
(file)
--- a/
Uplink/Uplink.class.php
+++ b/
Uplink/Uplink.class.php
@@
-454,7
+454,9
@@
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)));
+ $modestr = array_slice($args, 2);
+ if($modestr[0] == "+")
+ $modes->parseModes(implode(" ", $modestr));
}
private function recv_join($from, $args) {
}
private function recv_join($from, $args) {
@@
-690,7
+692,7
@@
class Uplink {
private function recv_mode($from, $args) {
$user = P10_User::getUserByNum($from);
private function recv_mode($from, $args) {
$user = P10_User::getUserByNum($from);
- if($user == null) {
+ if($user == null
&& strlen($from) != 2
) {
trigger_error("Server tries to send a modechange from an user that does not exist or was not found on recv_mode.", E_USER_ERROR);
return;
}
trigger_error("Server tries to send a modechange from an user that does not exist or was not found on recv_mode.", E_USER_ERROR);
return;
}
@@
-700,7
+702,7
@@
class Uplink {
if($channel == null)
$channel = new P10_Channel($args[0]);
$channel->getModes()->setModes($modes);
if($channel == null)
$channel = new P10_Channel($args[0]);
$channel->getModes()->setModes($modes);
- if($this->eventHandler)
+ if($this->eventHandler
&& strlen($from) != 2
)
$this->eventHandler->event_chanmode($user, $channel, $modes);
} else {
$targetUser = P10_User::getUserByNick($args[0]);
$this->eventHandler->event_chanmode($user, $channel, $modes);
} else {
$targetUser = P10_User::getUserByNick($args[0]);