Changeset 1402

Timestamp:

02/16/11 12:24:09 (15 months ago)

Author:

zeank

Message:

private messaging
closes #273

Location:

HelpIM3/branches/chatgroups

Files:

• HelpIM/chat/templates/SubChat.py (modified) (2 diffs)
• htdocs/chat.js (modified) (2 diffs)
• htdocs/groupchat_iroster.html (modified) (2 diffs)

HelpIM3/branches/chatgroups/HelpIM/chat/templates/SubChat.py

@@ -67 +67 @@
     <table border="0" width="100%" height="100%" cellspacing="0" cellpadding="8px">
         <tr> <!-- header -->
-          <td colspan=2 class="spaced" align="right">
+          <td colspan="2" class="spaced" align="right">
           <table border="0" cellspacing="0" cellpadding="0" width="100%">
           <tr>
@@ -96 +96 @@
           <td style="height: 100%; width: 132px;" class="spaced">
             <table width="100%" height="100%;" cellspacing="0" cellpadding="8px">
-            <tr><td style="height: 100%; width: 120px;" id="roster_pane">
-              <iframe src="/htdocs/groupchat_iroster.html"
-                      id="groupchatIRoster"
-                      name="groupchatIRoster"
-                      scrolling="auto"
-                      style="height:100%;width:120px;"
-                      class="gcIframe"
-                      frameborder="0">
-              </iframe>
-              
-            </td></tr>
-            <tr><td style="width: 120px;" valign="top" id="button_pane">
-              <div id="rosterUserActionButtons">
-              <button id="noneButton">kick</button>
-              <button id="participantButton">voice</button>
-              <button id="visitorButton">devoice</button>
-              </div>
-              <button id="visitorsButton">Devoice All</button>
-              <button id="participantsButton">Voice All</button>
-
-            </td></tr>
+              <tr><td style="height: 100%; width: 120px;" id="roster_pane">
+                  <iframe src="/htdocs/groupchat_iroster.html"
+                          id="groupchatIRoster"
+                          name="groupchatIRoster"
+                          scrolling="auto"
+                          style="height:100%;width:120px;"
+                          class="gcIframe"
+                          frameborder="0">
+                  </iframe>
+              </td></tr>
+              <tr><td style="width: 120px;" valign="top" id="button_pane">
+                  <div id="rosterUserActionButtons">
+                    <button id="noneButton">kick</button>
+                    <button id="participantButton">voice</button>
+                    <button id="visitorButton">devoice</button>
+                  </div>
+                  <button id="visitorsButton">Devoice All</button>
+                  <button id="participantsButton">Voice All</button>
+              </td></tr>
             </table>
           </td>
         </tr>
         <tr>
-          <td colspan=2 class="spaced"><span id="emoticonBar"></span><span id="typingnotification" class="notification"></span>
+          <td colspan="2" class="spaced"><span id="emoticonBar"></span><span id="typingnotification" class="notification"></span>
           </td>
         </tr>
-        <tr>
+      <tr>
           <td colspan="2" class="spaced">
-            <textarea type="text" 
-                    id="msgbox" style="width:100%;" rows="4" tabindex="1" 
-                    onKeyPress="return msgboxKeyPressed(this,event);"  
-                    onKeyDown="return msgboxKeyDown(this,event);" 
-                    onFocus="storeCaret(this);"
-                    onKeyUp="return msgboxKeyUp(this);"
-                    onSelect="storeCaret(this);"
-                    onClick="storeCaret(this);"></textarea>
+           <table border="0" cellspacing="0" cellpadding="0" width="100%" height="100%">
+              <tr>
+               <td id="send_to_label" nowrap="nowrap"></td>
+               <td width="100%">
+                  <textarea type="text" 
+                            id="msgbox" style="width:100%;" rows="4" tabindex="1" 
+                            onKeyPress="return msgboxKeyPressed(this,event);"  
+                            onKeyDown="return msgboxKeyDown(this,event);" 
+                            onFocus="storeCaret(this);"
+                            onKeyUp="return msgboxKeyUp(this);"
+                            onSelect="storeCaret(this);"
+                            onClick="storeCaret(this);"></textarea>
+               </td>
+              </tr>
+            </table>
           </td>
         </tr>

HelpIM3/branches/chatgroups/htdocs/chat.js

@@ -62 +62 @@
 
     var aMessage = new JSJaCMessage();
-    if (staffChat && frames['groupchatIRoster'].userSelected) {
+    if ((staffChat || srcW.CHATGROUP_CHAT) &&
+                HIM.el.byId('send_to_label').innerHTML != '') {
         to = frames['groupchatIRoster'].userSelected.getAttribute('username');
         var jid = roster.getFullJIDByNick(htmlFullEnc(to));
+                var user = roster.getUserByJID(jid);
+                if (!roster.me.role == 'moderator' && !user.role == 'moderator') {
+                        // not allowed to send to non moderator as non moderator
+                        return false;
+                }
         if (jid == null) {
             putMsgHTML("No such nick"+": " + htmlFullEnc(to), new Date().toLocaleTimeString(), group);
@@ -108 +114 @@
 
 function sendState(state) {
-    if (!staffChat) { // only send in one2one context
-        var aMessage = new JSJaCMessage(); 
-        aMessage.setType('groupchat');
-        aMessage.setTo(group);
-        aMessage.setState(state);
-        if (aMessage.getState()) // only send if valid state
-            srcW.con.send(aMessage);
+    if (!staffChat) { // only send in one2one context or chatgroup context
+        var oMsg = new JSJaCMessage();
+                if (HIM.el.byId('send_to_label').innerHTML != '' &&
+                        frames['groupchatIRoster'].userSelected) {
+                        // seems we're in priv msg mode - check if allowed sending
+                        to = frames['groupchatIRoster'].userSelected.getAttribute('username');
+                        var jid = roster.getFullJIDByNick(htmlFullEnc(to));
+                        var user = roster.getUserByJID(jid);
+                        if (!roster.me.role == 'moderator' && !user.role == 'moderator') {
+                                // not allowed to send to non moderator as non moderator
+                                return false;
+                        }
+                        oMsg.setType('chat');
+                        oMsg.setTo(jid);
+                } else {
+                        oMsg.setType('groupchat');
+                        oMsg.setTo(group);
+                }
+                oMsg.setState(state);
+                if (oMsg.getState()) // only send if valid state
+                        srcW.con.send(oMsg);
     }
 }

HelpIM3/branches/chatgroups/htdocs/groupchat_iroster.html

@@ -53 +53 @@
         firingobj = document.getElementById('rosterUser_'+nick);
     }
+        parent.HIM.el.byId('send_to_label').innerHTML = ""; // reset
     if (firingobj && (firingobj.className == 'rosterUserSelected' || 
                       firingobj.className == 'rosterUser') && 
@@ -60 +61 @@
         userSelected = firingobj;
 
+                var user = parent.roster.getUserByJID(parent.roster.getFullJIDByNick(nick));
+
+                if (parent.roster.me.role == 'moderator' ||
+                        user.role == 'moderator') {
+                        parent.HIM.el.byId('send_to_label').innerHTML = "<span class='privMsg'>["+htmlEnc(nick)+"]</span>&nbsp;";
+                }
 
         if (parent.roster.me.role == 'moderator' && parent.srcW.CHATGROUP_CHAT) {
             // show action buttons
-            var user = parent.roster.getUserByJID(
-                parent.roster.getFullJIDByNick(nick));
             if (user && user.role != 'moderator') {
                 actionButtons.forEach(