Changeset 114966 in indico

Timestamp:

10/21/10 10:33:56 (3 years ago)

Author:

Jose Benito <jose.benito.gonzalez@…>

Branches:

new-webex

Children:

5aefa1

Parents:

66081b

git-author:

Kevin Flannery <flannery@…> (06/03/10 23:15:23)

git-committer:

Jose Benito <jose.benito.gonzalez@…> (10/21/10 10:33:56)

Message:

Removed start meeting button

Location:

indico/MaKaC/plugins/Collaboration/WebEx

Files:

• api/operations.py (modified) (3 diffs)
• collaboration.py (modified) (5 diffs)
• common.py (modified) (1 diff)
• mail.py (modified) (1 diff)
• options.py (modified) (1 diff)
• tpls/Main.js (modified) (1 diff)

indico/MaKaC/plugins/Collaboration/WebEx/api/operations.py

@@ -223 +223 @@
                 GenericMailer.send( notification )
             if MailTools.needToSendEmails('WebEx'):
+                Logger.get('WebEx').info("We need to alert WebEx admins; attempting to send emails")
                 try:
                     notification = WebExMeetingModifiedNotificationAdmin(booking)
                     GenericMailer.sendAndLog(notification, booking.getConference(),
-                                     "MaKaC/plugins/Collaboration/WebEx/collaboration.py",
-                                     booking.getConference().getCreator())
-                except Exception, e:
-                    Logger.get('WebEx').error(
-                        """Could not send WebExMeetingModifiedNotificationAdmin for booking with id %s of event with id %s, exception: %s""" %
-                        (booking.getId(), booking.getConference().getId(), str(e)))
+                            "MaKaC/plugins/Collaboration/WebEx/collaboration.py",
+                            booking.getConference().getCreator())
+                except Exception, e:
+                    Logger.get('WebEx').error(
+                               """Could not send WebExMeetingModifiedNotificationAdmin for booking with id %s of event with id %s, exception: %s""" %
+                               (booking.getId(), booking.getConference().getId(), str(e)))
             if booking._bookingParams["sendMailToManagers"]:
                 try:
@@ -281 +282 @@
 
         if booking._created:
+            if MailTools.needToSendEmails('WebEx'):
+                Logger.get('WebEx').info("We need to alert WebEx admins; attempting to send emails")
+                try:
+                    notification = WebExMeetingRemovalNotificationAdmin(booking)
+                    GenericMailer.sendAndLog(notification, booking.getConference(),
+                            "MaKaC/plugins/Collaboration/WebEx/collaboration.py",
+                            booking.getConference().getCreator())
+                except Exception, e:
+                    Logger.get('WebEx').error(
+                               """Could not send WebExMeetingRemovalNotificationAdmin for booking with id %s of event with id %s, exception: %s""" %
+                               (booking.getId(), booking.getConference().getId(), str(e)))
 #            if MailTools.needToSendEmails('WebEx'):
             if True:
                 try:
-#                    notification = WebExParticipantNotification(booking, [ "flannery@gmail.com", "flannery@fnal.gov", "flannery@imsa.edu" ])
-                    #send(addto, addcc, addfrom, subject, body):
                     Logger.get('WebEx').info("I am in the mailer block")
-                    recipients = ""
-                    for k in participants.keys():
-                        recipients += participants[k]._email + " , "
-                    Logger.get('WebEx').info("Recipients: " + recipients )
-                    personMail.send(recipients, "", "Kevin O'Flannery", "A Subject", "Some body in here" )
-#notification, booking.getConference(),
-#                                             "MaKaC/plugins/Collaboration/WebEx/collaboration.py",
-#                                             booking.getConference().getCreator())
+                    recipients = []
+                    for k in booking._participants.keys():
+                        recipients.append( booking._participants[k]._email )
+                    if len(recipients)>0:
+                        notification = WebExParticipantNotification( booking, recipients, 'delete' )
+                        GenericMailer.send( notification )
                 except Exception, e:
                     Logger.get('WebEx').error(
@@ -300 +308 @@
                         (booking.getId(), booking.getConference().getId(), str(e)))
                
-#                if booking._bookingParams["sendMailToManagers"]:
-#                    try:
-#                        notification = EVOMeetingRemovalNotificationManager(booking)
-#                        GenericMailer.sendAndLog(notification, booking.getConference(),
-#                                             "MaKaC/plugins/Collaboration/WebEx/collaboration.py",
-#                                             booking.getConference().getCreator())
-#                    except Exception,e:
-#                        Logger.get('EVO').error(
-#                            """Could not send EVOMeetingRemovalNotificationManager for booking with id %s , exception: %s""" % (booking._id, str(e)))
+                if booking._bookingParams["sendMailToManagers"]:
+                    try:
+                        notification = WebExMeetingRemovalNotificationManager(booking)
+                        GenericMailer.sendAndLog(notification, booking.getConference(),
+                                             "MaKaC/plugins/Collaboration/WebEx/collaboration.py",
+                                             booking.getConference().getCreator())
+                    except Exception,e:
+                        Logger.get('WebEx').error(
+                            """Could not send EVOMeetingRemovalNotificationManager for booking with id %s , exception: %s""" % (booking._id, str(e)))
         return None
 

indico/MaKaC/plugins/Collaboration/WebEx/collaboration.py

@@ -28 +28 @@
 import re
 import datetime
+import httplib
 from datetime import timedelta, datetime
 from MaKaC.common.utils import formatDateTime
@@ -35 +36 @@
     getMinStartDate, getMaxEndDate, Participant, sendXMLRequest, \
     WebExError, getWebExOptionValueByName, makeTime, findDuration
-#from MaKaC.plugins.Collaboration.WebEx.mail import NewWebExMeetingNotificationManager
 from MaKaC.plugins.Collaboration.WebEx.api.operations import WebExOperations
 from MaKaC.common.logger import Logger
@@ -74 +74 @@
             "meetingTitle": (str, ''),
             "meetingDescription": (str, None),
-            "sendMailToManagers": (bool, False),
+#            "sendMailToManagers": (bool, False),
             "webExUser":(str, None),
             "webExPass":(str, None),
@@ -323 +323 @@
         Logger.get('WebEx').debug( "in _modify" )
         if self._created:
-#            result = ExternalOperationsManager.execute(self, "modifyRoom", VidyoOperations.modifyRoom, self, oldBookingParams)
             result = ExternalOperationsManager.execute(self, "modifyBooking", WebExOperations.modifyBooking, self)
             if isinstance(result, WebExError):
@@ -337 +336 @@
         """
         Logger.get('WebEx').debug( "in _start" )
+##########################
+#        try:
+#            site_name = re.split( '.webex.com', getWebExOptionValueByName("WEhttpServerLocation").lower())[0]
+#        except:
+#            raise WebExException(_("Could not isolate the site name from the given site URL in the WebEx plugin configuration in the administration area.\n") )
+#        try:
+#####            urllib.urllibopen( "https://" + site_name + ".webex.com/" + site_name + "/m.php?AT=HM&MK=" + self._webExKey )
+#            conn = httplib.HTTPSConnection( getWebExOptionValueByName("WEhttpServerLocation") )
+#            values = {}
+#            conn.request( "POST", "/" + site_name + "/p.php?AT=LO", values )
+#            response = conn.getresponse()
+###################
+#print the_xml
+#print response.read()
+#           urllib.urllibopen( "https://" + site_name + ".webex.com/" + site_name + "/m.php?AT=HM&MK=" + self._webExKey )
+#        except:
+#            raise WebExException(_("Could not connect to site url and start the meeting.\n") )
+
+
+
         #Check if they left the trialing slash in the base URL we need
 #        if getWebExOptionValueByName("WEhttpServerLocation")[-1] == "/":

indico/MaKaC/plugins/Collaboration/WebEx/common.py

@@ -187 +187 @@
         return self._id
 
+    def getParticipantName(self):
+         return "%s, %s" % ( self.getFamilyName(), self.getFirstName() )
+
     def getTitle(self):
         return self._title

indico/MaKaC/plugins/Collaboration/WebEx/mail.py

@@ -307 +307 @@
     
     def __init__(self, booking):
-        EVOAdminNotificationBase.__init__(self, booking)
-        
-        self.setSubject("""[EVO] EVO meeting deleted: %s (event id: %s)"""
-                        % (self._conference.getTitle(), str(self._conference.getId())))
-        
-        self.setBody("""Dear EVO Responsible,<br />
-<br />
-An EVO meeting <strong>was deleted</strong> in <a href="%s">%s</a><br />
+        WebExAdminNotificationBase.__init__(self, booking)
+        
+        self.setSubject("""[Indico] WebEx meeting deleted: %s (event id: %s)"""
+                        % (self._conference.getTitle(), str(self._conference.getId())))
+        
+        self.setBody("""Dear WebEx Responsible,<br />
+<br />
+A WebEx meeting <strong>was deleted</strong> in <a href="%s">%s</a><br />
 <br />
 %s

indico/MaKaC/plugins/Collaboration/WebEx/options.py

@@ -55 +55 @@
                            "type": str,
                            "defaultValue": "apidemoeu.webex.com"} ),
-    ("WEautoJoinURL", {"description" : _("WebEx HTTP path to for auto-join script"),
-                           "type": str,
-                           "defaultValue": "https://apidemoeu.webex.com/apidemoeu/"} ),
     ("expirationTime", {"description" : _("Expiration time in minutes"),
                            "type": int,

indico/MaKaC/plugins/Collaboration/WebEx/tpls/Main.js

@@ -151 +151 @@
             '<tr><td colspan="2">'+
                 '<div class="collaborationWarning" style="display: inline;">' +
-                    $T('Changed by WebEx Staff:') + 
+                    $T('Changes to WebEx event:') + 
                     '<ul>'