Version bump, shorten enrol_cvent_registration_guest.

enrol_cvent_registration_guest is too long, now it's senrol_cvent_reg_guest.
moquist · Feb 16, 2013 · 1f67962 · 1f67962
1 parent 1d34db4
commit 1f67962
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 139 deletions.
diff --git a/cli/test.php b/cli/test.php
diff --git a/db/install.xml b/db/install.xml
@@ -96,7 +96,7 @@
         <KEY NAME="primary" TYPE="primary" FIELDS="id"/>
       </KEYS>
     </TABLE>
-    <TABLE NAME="enrol_cvent_contact" COMMENT="save copies of CVent Contact objects" PREVIOUS="enrol_cvent_registration" NEXT="enrol_cvent_registration_guest">
+    <TABLE NAME="enrol_cvent_contact" COMMENT="save copies of CVent Contact objects" PREVIOUS="enrol_cvent_registration" NEXT="enrol_cvent_reg_guest">
       <FIELDS>
         <FIELD NAME="id" TYPE="int" LENGTH="10" NOTNULL="true" UNSIGNED="true" SEQUENCE="true" ENUM="false" NEXT="contactid"/>
         <FIELD NAME="contactid" TYPE="char" LENGTH="255" NOTNULL="false" SEQUENCE="false" ENUM="false" COMMENT="Contact.Id value from Cvent" PREVIOUS="id" NEXT="sourceid"/>
@@ -158,7 +158,7 @@
         <KEY NAME="primary" TYPE="primary" FIELDS="id"/>
       </KEYS>
     </TABLE>
-    <TABLE NAME="enrol_cvent_registration_guest" COMMENT="Registration.GuestDetail data from Cvent" PREVIOUS="enrol_cvent_contact">
+    <TABLE NAME="enrol_cvent_reg_guest" COMMENT="Registration.GuestDetail data from Cvent" PREVIOUS="enrol_cvent_contact">
       <FIELDS>
         <FIELD NAME="id" TYPE="int" LENGTH="10" NOTNULL="true" UNSIGNED="true" SEQUENCE="true" ENUM="false" NEXT="registrationid"/>
         <FIELD NAME="registrationid" TYPE="char" LENGTH="255" NOTNULL="true" SEQUENCE="false" ENUM="false" PREVIOUS="id" NEXT="guestid"/>

diff --git a/lib.php b/lib.php
@@ -54,7 +54,7 @@ public function sync_user_enrolments($user) {
                 }
             }
         }
-        if ($guestings = $DB->get_records_sql("SELECT g.* FROM {enrol_cvent_registration_guest} g JOIN {enrol_cvent_registration} r ON r.registrationid = g.registrationid WHERE g.emailaddress = ? AND r.status = ?", array($user->username, CV_ACCEPTED))) {
+        if ($guestings = $DB->get_records_sql("SELECT g.* FROM {enrol_cvent_reg_guest} g JOIN {enrol_cvent_registration} r ON r.registrationid = g.registrationid WHERE g.emailaddress = ? AND r.status = ?", array($user->username, CV_ACCEPTED))) {
             # Ensure enrollment for each course where this user is a Cvent-guest.
             foreach ($guestings as $guesting) {
                 if ($courseid = $this->ensure_enrolment($guesting->registrationid, $user)) {
@@ -72,7 +72,7 @@ public function sync_user_enrolments($user) {
         $rs = $DB->get_recordset_sql($sql, array('userid' => $user->id, 'plugin' => CV_NAME));
         foreach ($rs as $instance) {
             if (!$context = get_context_instance(CONTEXT_COURSE, $instance->courseid)) {
-                //weird
+                // weird...
                 continue;
             }
 
@@ -81,7 +81,7 @@ public function sync_user_enrolments($user) {
                 continue;
             }
 
-            // deal with enrolments removed from external table
+            // deal with enrolments removed from Cvent
             if ($unenrolaction == ENROL_EXT_REMOVED_UNENROL) {
                 // unenrol
                 $this->unenrol_user($instance, $user->id);
@@ -567,13 +567,13 @@ private function handle_registration_guestdetail($registrationid, $guestdetails)
                     }
                 }
             }
-            if ($rec = $DB->get_record('enrol_cvent_registration_guest', array('guestid' => $guestdetail->guestid))) {
+            if ($rec = $DB->get_record('enrol_cvent_reg_guest', array('guestid' => $guestdetail->guestid))) {
                 $guestdetail->id = $rec->id;
                 cvent_safe_print("Updating guestdetail ($guestdetail->guestid)<br />\n");
-                $DB->update_record('enrol_cvent_registration_guest', $guestdetail);
+                $DB->update_record('enrol_cvent_reg_guest', $guestdetail);
             } else {
                 cvent_safe_print("Inserting guestdetail ($guestdetail->guestid)<br />\n");
-                $DB->insert_record('enrol_cvent_registration_guest', $guestdetail);
+                $DB->insert_record('enrol_cvent_reg_guest', $guestdetail);
             }
             $guestdetail->homeaddress1 = $guestdetail->address1;
             $guestdetail->homecity = $guestdetail->city;

diff --git a/version.php b/version.php
@@ -1,6 +1,6 @@
 <?php // $Id$
 
-$plugin->version  = 2013011200;
+$plugin->version  = 2013021600;
 $plugin->requires = 2011033007;
 $plugin->cron = 60;