X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fcoreuserinputhandler.cpp;h=45c71f0e9e6246855d31747422bed151cf99d792;hp=930be966eac16278e9bd0073916f7a9b50ab294a;hb=7ecbc1bf921880f7b03af779de7d9611853a0d46;hpb=42bade02f5352701d4603c72a341f04ea05922c5

diff --git a/src/core/coreuserinputhandler.cpp b/src/core/coreuserinputhandler.cpp
index 930be966..45c71f0e 100644
--- a/src/core/coreuserinputhandler.cpp
+++ b/src/core/coreuserinputhandler.cpp
@@ -436,14 +436,31 @@ void CoreUserInputHandler::handleHalfop(const BufferInfo &bufferInfo, const QStr
     emit putCmd("MODE", serverEncode(params));
 }
 
-
-void CoreUserInputHandler::handleOp(const BufferInfo &bufferInfo, const QString &msg)
-{
-    QStringList nicks = msg.split(' ', QString::SkipEmptyParts);
-    QString m = "+"; for (int i = 0; i < nicks.count(); i++) m += 'o';
+void CoreUserInputHandler::handleOp(const BufferInfo &bufferInfo, const QString &msg) {
+  QStringList nicks;
+  if (msg == "*") {
+    const QList<IrcUser*> users = network()->ircChannel(bufferInfo.bufferName())->ircUsers();
+    foreach(IrcUser *user, users) {
+      if (!network()->ircChannel(bufferInfo.bufferName())->userModes(user).contains("o"))
+	nicks.append(user->nick());
+    }
+  } else { 
+    nicks = msg.split(' ', QString::SkipEmptyParts);
+  }
+  if (nicks.count() == 0) return;
+  
+  bool isNumber;
+  int maxModes = network()->support("MODES").toInt(&isNumber);
+  if (!isNumber || maxModes == 0) maxModes = 1;
+  
+  while (!nicks.isEmpty()) {
+    int amount = qMin(nicks.count(), maxModes);
+    QString m = "+"; for(int i = 0; i < amount; i++) m += 'o';
     QStringList params;
-    params << bufferInfo.bufferName() << m << nicks;
+    params << bufferInfo.bufferName() << m;
+    for(int i = 0; i < amount; i++) params << nicks.takeFirst();
     emit putCmd("MODE", serverEncode(params));
+  }
 }