$userstr = "";
}
$users = explode(",",$userstr);
- $isop = false; $isvoice = false;
+ $isop = false; $ishalfop = false; $isvoice = false;
foreach($users as $user) {
if($user == "") continue;
$uexp = explode(":", $user);
}
if(count($uexp) > 1) {
$isop = false;
+ $ishalfop = false;
$isvoice = false;
for($i = 0; $i < strlen($uexp[1]); $i++) {
if($uexp[1][0] == "@") $isop = true;
+ if($uexp[1][0] == "%") $ishalfop = true;
if($uexp[1][0] == "+") $isvoice = true;
}
}
trigger_error("burst parse error: cant find User '".$uexp[0]."'.", E_USER_ERROR);
return;
}
- $channel->burstUser($user, $isop, $isvoice);
+ $channel->burstUser($user, $isop, $ishalfop, $isvoice);
if($this->eventHandler)
$this->eventHandler->event_join($user, $channel, true);
}
return;
}
$targetUser->getModes()->setModes($modes);
- if($this->eventHandler)
+ $fakemodes = NULL;
+ if($targetUser->getModes()->hasMode("x") && $targetUser->getModes()->hasMode("r") && !$targetUser->getModes()->hasMode("f")) {
+ //user is registered and has umode +x set (automatically assign default fakehost)
+ $fakemodes = "+f ".$targetUser->getModes()->hasMode("r").".".$this->getSetting("his_usermask");
+ $targetUser->getModes()->setModes($fakemodes);
+ }
+ if($this->eventHandler) {
$this->eventHandler->event_usermode($targetUser, $modes);
+ if($fakemodes)
+ $this->eventHandler->event_usermode($targetUser, $fakemodes);
+ }
}
}
}
$auth = $args[1];
$user->getModes()->setModes("+r ".$auth);
- if($this->eventHandler)
+ $fakemodes = NULL;
+ if($user->getModes()->hasMode("x") && !$user->getModes()->hasMode("f")) {
+ //user is registered and has umode +x set (automatically assign default fakehost)
+ $fakemodes = "+f ".$auth.".".$this->getSetting("his_usermask");
+ $user->getModes()->setModes($fakemodes);
+ }
+ if($this->eventHandler) {
$this->eventHandler->event_usermode($user, "+r ".$auth);
+ if($fakemodes)
+ $this->eventHandler->event_usermode($user, $fakemodes);
+ }
}
private function recv_fakehost($from, $args) {
$this->send("N", $nick, $connect_time, $ident, $host, $modes, $ip, $numeric, $realname);
}
foreach(P10_Channel::getChannels() as $channel) {
- $sorted_users = array('ov' => array(), 'o' => array(), 'v' => array(), '-' => array());
+ $privs_to_burst = array('o', 'h', 'v' );
+ $priv_values = array(P10_Channel::USERPRIV_OPED, P10_Channel::USERPRIV_HALFOP, P10_Channel::USERPRIV_VOICE );
+ $priv_combinations = array();
+ $sorted_users = array();
+ $combinations = pow(2, count($privs_to_burst)); //binary possibilities => 2^count($privs_to_burst)
+ for($i = 0; $i < $combinations; $i++) {
+ //make a binary number out of $i
+ $binary = decbin($i);
+ while(strlen($binary) < count($privs_to_burst))
+ $binary = '0'.$binary;
+ $combination_name = '';
+ $combination_value = 0;
+ for($j = 0; $j < count($privs_to_burst); $j++) {
+ if($binary[$j] == '1') {
+ $combination_name .= $privs_to_burst[$j];
+ $combination_value += $priv_values[$j];
+ }
+ }
+ $priv_combinations[] = array("name" => $combination_name, "value" => $combination_value);
+ $sorted_users[$combination_value] = array();
+ }
$local_users = false;
foreach($channel->getUsers() as $user) {
if(substr($user->getNumeric(), 0, 2) != $this->server->getNumeric()) continue; //skip users that are not on the local server
$privs = $channel->getUserPrivs($user);
- $strPrivs = "";
- if(($privs & P10_Channel::USERPRIV_OPED)) $strPrivs .= "o";
- if(($privs & P10_Channel::USERPRIV_VOICE)) $strPrivs .= "v";
- if($strPrivs == "") $strPrivs = "-";
$local_users = true;
- $sorted_users[$strPrivs][] = $user;
+ $sorted_users[$privs][] = $user;
}
if(!$local_users) continue;
$userStr = "";
- foreach($sorted_users['-'] as $user) {
- if($userStr != "") $userStr.=",";
- $userStr .= $user->getNumeric();
- }
- foreach($sorted_users['ov'] as $i => $user) {
- if($userStr != "") $userStr.=",";
- $userStr .= $user->getNumeric();
- if($i == 0) $userStr .= ":ov";
- }
- foreach($sorted_users['o'] as $i => $user) {
- if($userStr != "") $userStr.=",";
- $userStr .= $user->getNumeric();
- if($i == 0) $userStr .= ":o";
- }
- foreach($sorted_users['v'] as $i => $user) {
- if($userStr != "") $userStr.=",";
- $userStr .= $user->getNumeric();
- if($i == 0) $userStr .= ":v";
- }
+ foreach($priv_combinations as $combination) {
+ $i = 0;
+ foreach($sorted_users[$combination['value']] as $user) {
+ if($userStr != "") $userStr.=",";
+ $userStr .= $user->getNumeric();
+ if(($i++) == 0 && $combination['value'] > 0) {
+ $userStr .= ":".$combination['name'];
+ }
+ }
+ }
$banString = "";
//TODO: Build ban String
$burstString = "";
if($privs != 0) {
$channel->setUserPrivs($user, $privs);
if(($this->flags & self::FLAG_CONNECTED)) {
- $modestr = "+".(($privs & P10_Channel::USERPRIV_OPED) ? "o" : "").(($privs & P10_Channel::USERPRIV_VOICE) ? "v" : "");
+ $modestr = "+".(($privs & P10_Channel::USERPRIV_OPED) ? "o" : "").(($privs & P10_Channel::USERPRIV_HALFOP) ? "h" : "").(($privs & P10_Channel::USERPRIV_VOICE) ? "v" : "");
$modestr .= (($privs & P10_Channel::USERPRIV_OPED) ? " ".$user->getNumeric() : "");
+ $modestr .= (($privs & P10_Channel::USERPRIV_HALFOP) ? " ".$user->getNumeric() : "");
$modestr .= (($privs & P10_Channel::USERPRIV_VOICE) ? " ".$user->getNumeric() : "");
$this->send("OM", $user->getNumeric(), $chanName, $modestr);
}
$this->eventHandler->event_kick($user, $target, $channel, $reason);
$channel->partUser($target, $reason);
if(($this->flags & self::FLAG_CONNECTED))
- $this->send("K", $user->getNumeric(), $chanName, $target->getNumeric(), $reason);
+ $this->send("K", $user->getNumeric(), $channel->getName(), $target->getNumeric(), $reason);
}
public function privmsg($user, $target, $message) {