projects
/
PHP-P10.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixed P10_ModeSets.class.php
[PHP-P10.git]
/
Uplink
/
P10_ModeSets.class.php
diff --git
a/Uplink/P10_ModeSets.class.php
b/Uplink/P10_ModeSets.class.php
index d5088a29fe53aad2fd7dc08853d17e1ba90aa4d4..2d1d03d9af4b094ef0f2a3732821337b5b89d91e 100644
(file)
--- a/
Uplink/P10_ModeSets.class.php
+++ b/
Uplink/P10_ModeSets.class.php
@@
-108,9
+108,9
@@
class P10_ChannelModeSet {
continue;
}
$flag = self::$modevalues[$mode];
continue;
}
$flag = self::$modevalues[$mode];
- if(self::$mode
value
s[$mode] == self::MODE_TYPE_A) continue; //we shouldn't get such a mode on parseModes
+ if(self::$modes[$mode] == self::MODE_TYPE_A) continue; //we shouldn't get such a mode on parseModes
$this->modeflags |= $flag;
$this->modeflags |= $flag;
- if(self::$mode
values[$mode] == self::MODE_TYPE_B || self::$modevalu
es[$mode] == self::MODE_TYPE_C) {
+ if(self::$mode
s[$mode] == self::MODE_TYPE_B || self::$mod
es[$mode] == self::MODE_TYPE_C) {
$this->modeparams[$mode] = $args[$c++];
}
}
$this->modeparams[$mode] = $args[$c++];
}
}
@@
-155,26
+155,26
@@
class P10_ChannelModeSet {
if($add) {
if($returndiff && !($this->modeflags & $flag)) {
$modestradd .= $mode;
if($add) {
if($returndiff && !($this->modeflags & $flag)) {
$modestradd .= $mode;
- if(self::$mode
values[$mode] == self::MODE_TYPE_B || self::$modevalu
es[$mode] == self::MODE_TYPE_C) {
+ if(self::$mode
s[$mode] == self::MODE_TYPE_B || self::$mod
es[$mode] == self::MODE_TYPE_C) {
$paramstradd .= " ".$args[$c];
}
}
$this->modeflags |= $flag;
$paramstradd .= " ".$args[$c];
}
}
$this->modeflags |= $flag;
- if(self::$mode
values[$mode] == self::MODE_TYPE_B || self::$modevalu
es[$mode] == self::MODE_TYPE_C) {
+ if(self::$mode
s[$mode] == self::MODE_TYPE_B || self::$mod
es[$mode] == self::MODE_TYPE_C) {
$this->modeparams[$mode] = $args[$c++];
}
} else {
if($returndiff && ($this->modeflags & $flag)) {
$modestrdel .= $mode;
$this->modeparams[$mode] = $args[$c++];
}
} else {
if($returndiff && ($this->modeflags & $flag)) {
$modestrdel .= $mode;
- if(self::$mode
value
s[$mode] == self::MODE_TYPE_C) {
+ if(self::$modes[$mode] == self::MODE_TYPE_C) {
$paramstrdel .= " ".$args[$c];
}
}
$this->modeflags &= ~$flag;
$paramstrdel .= " ".$args[$c];
}
}
$this->modeflags &= ~$flag;
- if(self::$mode
values[$mode] == self::MODE_TYPE_B || self::$modevalu
es[$mode] == self::MODE_TYPE_C) {
+ if(self::$mode
s[$mode] == self::MODE_TYPE_B || self::$mod
es[$mode] == self::MODE_TYPE_C) {
unset($this->modeparams[$mode]);
}
unset($this->modeparams[$mode]);
}
- if(self::$mode
value
s[$mode] == self::MODE_TYPE_C) $c++;
+ if(self::$modes[$mode] == self::MODE_TYPE_C) $c++;
}
}
if($returndiff) {
}
}
if($returndiff) {
@@
-210,7
+210,7
@@
class P10_ChannelModeSet {
foreach(self::$modevalues as $mode => $flag) {
if(($this->modeflags & $flag)) {
$modestr .= $mode;
foreach(self::$modevalues as $mode => $flag) {
if(($this->modeflags & $flag)) {
$modestr .= $mode;
- if(self::$mode
values[$mode] == self::MODE_TYPE_B || self::$modevalu
es[$mode] == self::MODE_TYPE_C) {
+ if(self::$mode
s[$mode] == self::MODE_TYPE_B || self::$mod
es[$mode] == self::MODE_TYPE_C) {
$paramstr .= " ".$this->modeparams[$mode];
}
}
$paramstr .= " ".$this->modeparams[$mode];
}
}
@@
-224,7
+224,7
@@
class P10_ChannelModeSet {
continue;
}
$flag = self::$modevalues[$mode];
continue;
}
$flag = self::$modevalues[$mode];
- if(self::$mode
values[$mode] == self::MODE_TYPE_B || self::$modevalu
es[$mode] == self::MODE_TYPE_C) {
+ if(self::$mode
s[$mode] == self::MODE_TYPE_B || self::$mod
es[$mode] == self::MODE_TYPE_C) {
return (($this->modeflags & $flag) ? $this->modeparams[$mode] : false);
} else
return ($this->modeflags & $flag);
return (($this->modeflags & $flag) ? $this->modeparams[$mode] : false);
} else
return ($this->modeflags & $flag);
@@
-289,7
+289,7
@@
class P10_UserModeSet {
}
$flag = self::$modevalues[$mode];
$this->modeflags |= $flag;
}
$flag = self::$modevalues[$mode];
$this->modeflags |= $flag;
- if(self::$mode
value
s[$mode] == self::MODE_WITH_PARAMETER) {
+ if(self::$modes[$mode] == self::MODE_WITH_PARAMETER) {
$this->modeparams[$mode] = $args[$c++];
}
}
$this->modeparams[$mode] = $args[$c++];
}
}
@@
-320,12
+320,12
@@
class P10_UserModeSet {
if($add) {
if($returndiff && !($this->modeflags & $flag)) {
$modestradd .= $mode;
if($add) {
if($returndiff && !($this->modeflags & $flag)) {
$modestradd .= $mode;
- if(self::$mode
value
s[$mode] == self::MODE_WITH_PARAMETER) {
+ if(self::$modes[$mode] == self::MODE_WITH_PARAMETER) {
$paramstradd .= " ".$args[$c];
}
}
$this->modeflags |= $flag;
$paramstradd .= " ".$args[$c];
}
}
$this->modeflags |= $flag;
- if(self::$mode
value
s[$mode] == self::MODE_WITH_PARAMETER) {
+ if(self::$modes[$mode] == self::MODE_WITH_PARAMETER) {
$this->modeparams[$mode] = $args[$c++];
}
} else {
$this->modeparams[$mode] = $args[$c++];
}
} else {
@@
-349,7
+349,7
@@
class P10_UserModeSet {
foreach(self::$modevalues as $mode => $flag) {
if(($this->modeflags & $flag)) {
$modestr .= $mode;
foreach(self::$modevalues as $mode => $flag) {
if(($this->modeflags & $flag)) {
$modestr .= $mode;
- if(self::$mode
value
s[$mode] == self::MODE_WITH_PARAMETER) {
+ if(self::$modes[$mode] == self::MODE_WITH_PARAMETER) {
$paramstr .= " ".$this->modeparams[$mode];
}
}
$paramstr .= " ".$this->modeparams[$mode];
}
}
@@
-363,7
+363,7
@@
class P10_UserModeSet {
continue;
}
$flag = self::$modevalues[$mode];
continue;
}
$flag = self::$modevalues[$mode];
- if(self::$mode
value
s[$mode] == self::MODE_WITH_PARAMETER) {
+ if(self::$modes[$mode] == self::MODE_WITH_PARAMETER) {
return (($this->modeflags & $flag) ? $this->modeparams[$mode] : false);
} else
return ($this->modeflags & $flag);
return (($this->modeflags & $flag) ? $this->modeparams[$mode] : false);
} else
return ($this->modeflags & $flag);