From f636c2f59359ed300b7b393cc5d6c95c5e4edf14 Mon Sep 17 00:00:00 2001
From: jmalmsten-panopto <jmalmsten@panopto.com>
Date: Wed, 7 Sep 2022 09:43:36 -0700
Subject: [PATCH] 2022090700 release code. (#191)

---
 LICENSE.txt                                   |   2 +
 SSO.php                                       |  41 ++-
 block_panopto.php                             |  21 +-
 build_category_structure.php                  |   9 +-
 classes/admin/trim_configtext.php             |   8 +-
 classes/categorytasks.php                     |   7 +-
 .../panopto_build_category_structure_form.php |   9 +-
 classes/panopto_provision_form.php            |   7 +-
 classes/panopto_rename_all_folders_form.php   |   6 +-
 classes/panopto_unprovision_course_form.php   |   1 +
 classes/panopto_unprovision_form.php          |   6 +-
 classes/panopto_upgrade_all_folders_form.php  |   6 +-
 classes/privacy/provider.php                  | 121 ++++---
 classes/rollingsync.php                       |  34 +-
 classes/task/ensure_category.php              |  19 +-
 classes/task/provision_course.php             |   9 +-
 classes/task/sync_user.php                    |  17 +-
 classes/task/sync_user_login.php              |  13 +-
 db/access.php                                 |   2 +-
 db/events.php                                 |   2 +-
 db/upgrade.php                                |  55 ++--
 edit_form.php                                 |   9 +-
 lang/en/block_panopto.php                     |   1 +
 .../AuthManagementWsdlClass.php               |   3 +-
 ...AuthManagementStructAuthenticationInfo.php |   4 +-
 ...ementStructGetAuthenticatedUrlResponse.php |   4 +-
 ...nagementStructGetServerVersionResponse.php |   4 +-
 ...uthManagementStructGetAuthenticatedUrl.php |   4 +-
 .../AuthManagementStructLogOnWithPassword.php |   4 +-
 ...agementStructLogOnWithExternalProvider.php |   4 +-
 ...tructLogOnWithExternalProviderResponse.php |   4 +-
 ...agementStructLogOnWithPasswordResponse.php |   4 +-
 ...hManagementStructReportIntegrationInfo.php |   4 +-
 .../SessionManagementStructAddFolder.php      |   4 +-
 ...ssionManagementStructAddFolderResponse.php |   4 +-
 ...sionManagementStructAddSessionResponse.php |   4 +-
 .../SessionManagementStructAddSession.php     |   4 +-
 ...ionManagementStructAreUsersNotesPublic.php |   4 +-
 ...ementStructAreUsersNotesPublicResponse.php |   4 +-
 ...StructArrayOfFolderWithExternalContext.php |   4 +-
 .../SessionManagementStructArrayOfFolder.php  |   4 +-
 .../SessionManagementStructArrayOfNote.php    |   4 +-
 ...mentStructArrayOfExternalHierarchyInfo.php |   4 +-
 .../SessionManagementStructArrayOfguid.php    |   4 +-
 .../SessionManagementStructArrayOfstring.php  |   4 +-
 ...ssionManagementStructArrayOfAccessRole.php |   4 +-
 .../SessionManagementStructArrayOfSession.php |   4 +-
 ...tructArrayOfFolderAvailabilitySettings.php |   4 +-
 ...ructArrayOfSessionAvailabilitySettings.php |   4 +-
 ...ionManagementStructArrayOfSessionState.php |   4 +-
 ...sionManagementStructAuthenticationInfo.php |   4 +-
 ...StructCreateNoteByAbsoluteTimeResponse.php |   4 +-
 ...StructCreateNoteByRelativeTimeResponse.php |   4 +-
 ...ementStructCreateCaptionByAbsoluteTime.php |   4 +-
 ...ementStructCreateCaptionByRelativeTime.php |   4 +-
 ...nagementStructCreateNoteByAbsoluteTime.php |   4 +-
 ...nagementStructCreateNoteByRelativeTime.php |   4 +-
 .../SessionManagementStructDateTimeOffset.php |   4 +-
 .../SessionManagementStructDeleteFolders.php  |   4 +-
 .../SessionManagementStructDeleteNote.php     |   4 +-
 .../SessionManagementStructDeleteSessions.php |   4 +-
 .../Note/SessionManagementStructEditNote.php  |   4 +-
 ...entStructEnsureExternalHierarchyBranch.php |   4 +-
 ...tEnsureExternalHierarchyBranchResponse.php |   4 +-
 ...nManagementStructExternalHierarchyInfo.php |   6 +-
 .../SessionManagementStructFolderBase.php     |   4 +-
 ...agementStructFolderWithExternalContext.php |   4 +-
 .../Folder/SessionManagementStructFolder.php  |   4 +-
 ...gementStructFolderAvailabilitySettings.php |   4 +-
 ...tStructFoldersWithAvailabilitySettings.php |   4 +-
 ...agementStructGetAllFoldersByExternalId.php |   4 +-
 ...FoldersWithExternalContextByExternalId.php |   4 +-
 ...ManagementStructGetFoldersByExternalId.php |   4 +-
 .../SessionManagementStructGetFoldersById.php |   4 +-
 ...FoldersWithExternalContextByExternalId.php |   4 +-
 ...tructGetFoldersWithExternalContextById.php |   4 +-
 ...anagementStructGetSessionsByExternalId.php |   4 +-
 ...SessionManagementStructGetSessionsById.php |   4 +-
 ...nManagementStructGetCreatorFoldersList.php |   4 +-
 ...tCreatorFoldersWithExternalContextList.php |   4 +-
 .../SessionManagementStructGetFoldersList.php |   4 +-
 ...tructGetFoldersWithExternalContextList.php |   4 +-
 ...SessionManagementStructGetSessionsList.php |   4 +-
 .../Note/SessionManagementStructGetNote.php   |   4 +-
 ...tructGetAllFoldersByExternalIdResponse.php |   4 +-
 ...ithExternalContextByExternalIdResponse.php |   4 +-
 ...entStructGetCreatorFoldersListResponse.php |   4 +-
 ...FoldersWithExternalContextListResponse.php |   4 +-
 ...GetFoldersAvailabilitySettingsResponse.php |   4 +-
 ...ntStructGetFoldersByExternalIdResponse.php |   4 +-
 ...ManagementStructGetFoldersByIdResponse.php |   4 +-
 ...ManagementStructGetFoldersListResponse.php |   4 +-
 ...ithExternalContextByExternalIdResponse.php |   4 +-
 ...FoldersWithExternalContextByIdResponse.php |   4 +-
 ...FoldersWithExternalContextListResponse.php |   4 +-
 ...SessionManagementStructGetNoteResponse.php |   4 +-
 ...StructGetPersonalFolderForUserResponse.php |   4 +-
 ...tStructGetRecorderDownloadUrlsResponse.php |   4 +-
 ...etSessionsAvailabilitySettingsResponse.php |   4 +-
 ...tStructGetSessionsByExternalIdResponse.php |   4 +-
 ...anagementStructGetSessionsByIdResponse.php |   4 +-
 ...anagementStructGetSessionsListResponse.php |   4 +-
 ...ntStructGetFoldersAvailabilitySettings.php |   4 +-
 ...tStructGetSessionsAvailabilitySettings.php |   4 +-
 ...nagementStructGetPersonalFolderForUser.php |   4 +-
 .../SessionManagementStructIsDropbox.php      |   4 +-
 ...ssionManagementStructIsDropboxResponse.php |   4 +-
 ...ListFoldersResponseWithExternalContext.php |   4 +-
 .../SessionManagementStructListNotes.php      |   4 +-
 ...sionManagementStructListFoldersRequest.php |   4 +-
 ...ionManagementStructListSessionsRequest.php |   4 +-
 ...ionManagementStructListFoldersResponse.php |   4 +-
 ...ssionManagementStructListNotesResponse.php |   4 +-
 ...onManagementStructListSessionsResponse.php |   4 +-
 .../SessionManagementStructMoveSessions.php   |   4 +-
 .../Note/SessionManagementStructNote.php      |   4 +-
 .../SessionManagementStructPagination.php     |   4 +-
 ...anagementStructProvisionExternalCourse.php |   4 +-
 ...tStructProvisionExternalCourseResponse.php |   4 +-
 ...ovisionExternalCourseWithRolesResponse.php |   4 +-
 ...StructProvisionExternalCourseWithRoles.php |   4 +-
 ...ementStructRecorderDownloadUrlResponse.php |   4 +-
 .../SessionManagementStructSession.php        |   4 +-
 ...ementStructSessionAvailabilitySettings.php |   4 +-
 .../SessionManagementWsdlClass.php            |   3 +-
 ...StructSessionsWithAvailabilitySettings.php |   4 +-
 ...entStructSetCopiedExternalCourseAccess.php |   4 +-
 ...anagementStructSetExternalCourseAccess.php |   4 +-
 .../SessionManagementStructSetNotesPublic.php |   4 +-
 ...edExternalCourseAccessForRolesResponse.php |   4 +-
 ...tSetCopiedExternalCourseAccessResponse.php |   4 +-
 ...etExternalCourseAccessForRolesResponse.php |   4 +-
 ...tStructSetExternalCourseAccessResponse.php |   4 +-
 ...tSetCopiedExternalCourseAccessForRoles.php |   4 +-
 ...tStructSetExternalCourseAccessForRoles.php |   4 +-
 ...agementStructUnprovisionExternalCourse.php |   4 +-
 ...nagementStructUpdateSessionIsBroadcast.php |   4 +-
 ...anagementStructUpdateFolderDescription.php |   4 +-
 ...nagementStructUpdateSessionDescription.php |   4 +-
 ...StructUpdateFolderAllowSessionDownload.php |   4 +-
 ...ManagementStructUpdateFolderExternalId.php |   4 +-
 ...anagementStructUpdateSessionExternalId.php |   4 +-
 ...essionManagementStructUpdateFolderName.php |   4 +-
 ...ssionManagementStructUpdateSessionName.php |   4 +-
 ...mentStructUpdateFolderAllowPublicNotes.php |   4 +-
 ...sionManagementStructUpdateSessionOwner.php |   4 +-
 ...sionManagementStructUpdateFolderParent.php |   4 +-
 ...agementStructUpdateFolderEnablePodcast.php |   4 +-
 ...ructUpdateFolderExternalIdWithProvider.php |   4 +-
 ...FoldersAvailabilityEndSettingsResponse.php |   4 +-
 ...ldersAvailabilityStartSettingsResponse.php |   4 +-
 ...essionsAvailabilityEndSettingsResponse.php |   4 +-
 ...sionsAvailabilityStartSettingsResponse.php |   4 +-
 ...ctUpdateFoldersAvailabilityEndSettings.php |   4 +-
 ...UpdateFoldersAvailabilityStartSettings.php |   4 +-
 ...tUpdateSessionsAvailabilityEndSettings.php |   4 +-
 ...pdateSessionsAvailabilityStartSettings.php |   4 +-
 ...essionManagementStructUploadTranscript.php |   4 +-
 ...agementStructAddMembersToExternalGroup.php |   4 +-
 ...agementStructAddMembersToInternalGroup.php |   4 +-
 .../UserManagementStructArrayOfGroup.php      |   4 +-
 .../UserManagementStructArrayOfguid.php       |   4 +-
 .../UserManagementStructArrayOfstring.php     |   4 +-
 .../User/UserManagementStructArrayOfUser.php  |   4 +-
 ...UserManagementStructAuthenticationInfo.php |   4 +-
 ...serManagementStructCreateExternalGroup.php |   4 +-
 ...serManagementStructCreateInternalGroup.php |   4 +-
 ...ementStructCreateExternalGroupResponse.php |   4 +-
 ...ementStructCreateInternalGroupResponse.php |   4 +-
 ...UserManagementStructCreateUserResponse.php |   4 +-
 ...serManagementStructCreateUsersResponse.php |   4 +-
 .../User/UserManagementStructCreateUser.php   |   4 +-
 .../Users/UserManagementStructCreateUsers.php |   4 +-
 .../Group/UserManagementStructDeleteGroup.php |   4 +-
 .../Users/UserManagementStructDeleteUsers.php |   4 +-
 .../Group/UserManagementStructGetGroup.php    |   4 +-
 .../UserManagementStructGetUsersInGroup.php   |   4 +-
 .../Key/UserManagementStructGetUserByKey.php  |   4 +-
 .../UserManagementStructGetGroupsByName.php   |   4 +-
 .../UserManagementStructGetGroupIsPublic.php  |   4 +-
 ...nagementStructGetGroupIsPublicResponse.php |   4 +-
 .../UserManagementStructGetGroupResponse.php  |   4 +-
 ...anagementStructGetGroupsByNameResponse.php |   4 +-
 ...erManagementStructGetUserByKeyResponse.php |   4 +-
 ...anagementStructGetUsersInGroupResponse.php |   4 +-
 .../UserManagementStructGetUsersResponse.php  |   4 +-
 .../Users/UserManagementStructGetUsers.php    |   4 +-
 .../Group/UserManagementStructGroup.php       |   4 +-
 .../Groups/UserManagementStructListGroups.php |   4 +-
 .../UserManagementStructListUsersRequest.php  |   4 +-
 ...UserManagementStructListGroupsResponse.php |   4 +-
 .../UserManagementStructListUsersResponse.php |   4 +-
 .../Users/UserManagementStructListUsers.php   |   4 +-
 .../UserManagementStructPagination.php        |   4 +-
 ...ntStructRemoveMembersFromExternalGroup.php |   4 +-
 ...ntStructRemoveMembersFromInternalGroup.php |   4 +-
 .../UserManagementStructResetPassword.php     |   4 +-
 .../UserManagementStructSetGroupIsPublic.php  |   4 +-
 .../UserManagementStructSetSystemRole.php     |   4 +-
 .../UserManagementStructSyncExternalUser.php  |   4 +-
 .../UserManagementStructUnlockAccount.php     |   4 +-
 .../Bio/UserManagementStructUpdateUserBio.php |   4 +-
 .../UserManagementStructUpdateContactInfo.php |   4 +-
 .../UserManagementStructUpdatePassword.php    |   4 +-
 .../User/UserManagementStructUser.php         |   4 +-
 .../UserManagementWsdlClass.php               |   3 +-
 lib/block_panopto_bulk_lib.php                | 152 +++++----
 lib/block_panopto_lib.php                     |  75 +++--
 lib/cli/build_category_structure_cli.php      |  18 +-
 lib/cli/remove_all_panopto_adhoc_tasks.php    |   7 +-
 lib/cli/rename_all_folders_cli.php            |   5 +-
 lib/cli/upgrade_all_folders_cli.php           |   5 +-
 lib/panopto_auth_soap_client.php              |  29 +-
 lib/panopto_category_data.php                 | 117 ++++---
 lib/panopto_data.php                          | 298 ++++++++++++------
 lib/panopto_session_soap_client.php           | 179 ++++++++---
 lib/panopto_timeout_soap_client.php           | 121 ++++---
 lib/panopto_user_soap_client.php              |  26 +-
 lib/panoptoblock_lti_utility.php              |  20 +-
 panopto_content.php                           |  61 ++--
 provision_course.php                          |   8 +-
 provision_course_internal.php                 |  10 +-
 reinitialize_imports.php                      |  48 ++-
 settings.php                                  |  14 +-
 styles.css                                    |  55 ++--
 unprovision_course.php                        |   3 +-
 unprovision_course_internal.php               |   2 +-
 upgrade_all_folders.php                       |   4 +-
 version.php                                   |   4 +-
 views/bulk_rename_single_failed.html.php      |   3 +-
 views/bulk_rename_single_success.html.php     |   3 +-
 views/bulk_task_access_error.html.php         |   3 +-
 views/bulk_task_progress_bar.html.php         |   3 +-
 views/bulk_task_rename_warning.html.php       |   5 +-
 views/bulk_task_reprovision_warning.html.php  |   5 +-
 views/bulk_task_version_error.html.php        |   3 +-
 views/ensure_category_branch_failed.html.php  |  15 +-
 views/ensure_category_branch_start.html.php   |   7 +-
 views/ensure_category_branch_success.html.php |   3 +-
 views/imported_course.html.php                |  13 +-
 views/provisioned_course.html.php             |  52 ++-
 views/unprovisioned_course.html.php           |  11 +-
 242 files changed, 1466 insertions(+), 1057 deletions(-)

diff --git a/LICENSE.txt b/LICENSE.txt
index 94a9ed0..322df55 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -672,3 +672,5 @@ may consider it more useful to permit linking proprietary applications with
 the library.  If this is what you want to do, use the GNU Lesser General
 Public License instead of this License.  But first, please read
 <http://www.gnu.org/philosophy/why-not-lgpl.html>.
+
+END OF TERMS AND CONDITIONS
diff --git a/SSO.php b/SSO.php
index e122e2c..8d98fe9 100644
--- a/SSO.php
+++ b/SSO.php
@@ -24,11 +24,7 @@
 
 // This can't be defined Moodle internal because it is called from Panopto to authorize login.
 
-global $CFG, $USER;
-
-if (empty($CFG)) {
-    require_once(dirname(__FILE__) . '/../../config.php');
-}
+require_once(dirname(__FILE__) . '/../../config.php');
 require_once($CFG->libdir . '/weblib.php');
 require_once(dirname(__FILE__) . '/lib/block_panopto_lib.php');
 
@@ -37,7 +33,7 @@
 $configuredserverarray = panopto_get_configured_panopto_servers();
 
 $callbackverified = false;
-foreach($configuredserverarray as  $possibleserver) {
+foreach ($configuredserverarray as $possibleserver) {
     if (strcasecmp($possibleserver, $servername) == 0) {
         $callbackhost = parse_url($callbackurl, PHP_URL_HOST);
 
@@ -49,7 +45,7 @@
 }
 
 if ($callbackverified) {
-    if (strpos($callbackurl, 'http%') !== false 
+    if (strpos($callbackurl, 'http%') !== false
      || strpos($callbackurl, 'https%') !== false) {
         $callbackurl = urldecode($callbackurl);
     }
@@ -74,7 +70,7 @@
         return;
     }
 
-    // No course ID (0).  Don't autologin guests (false).
+    // No course ID (0). Don't autologin guests (false).
     require_login(0, false);
 
     // Reproduce canonically-ordered incoming auth payload.
@@ -105,18 +101,39 @@
                 \core\task\manager::queue_adhoc_task($ssosynctask);
             break;
         }
+
+        // Strip ReturnUrl so we can append it on the end
+        parse_str(parse_url($callbackurl, PHP_URL_QUERY), $params);
+        $returnurl = isset($params['ReturnUrl']) ? $params['ReturnUrl'] : "";
+
+        // Handle fragment with hash.
+        $fragment = "#";
+        if (strpos($callbackurl, "#") !== false) {
+            $fragment .= strtok(explode("#", $callbackurl)[1], '&');
+        } else {
+            $fragment = "";
+        }
+
+        // Strip ReturnUrl from original URL and clean if necessary.
+        // This is constant LoginPageRedirectParamKey = "ReturnUrl" so it should always arrive in this format.
+        $url = preg_replace('/&?ReturnUrl=[^&]*/', '', $callbackurl);
+        $url = str_replace('?&', '?', $url);
+        $url = rtrim($url, '?');
+
         // Generate canonically-ordered auth payload string.
         $responseparams = 'serverName=' . $servername . '&externalUserKey=' . $userkey . '&expiration=' . $expiration;
         // Sign payload with shared key and hash.
         $responseauthcode = panopto_generate_auth_code($responseparams);
 
-        // Encode user key in case the backslash causes a sequence to be interpreted as an escape sequence
+        // Encode user key in case the backslash causes a sequence to be interpreted as an escape sequence.
         // (e.g. in the case of usernames that begin with digits).
         // Maintain the original canonical string to avoid signature mismatch.
-        $responseparamsencoded = 'serverName=' . $servername . '&externalUserKey=' . urlencode($userkey) . '&expiration=' . $expiration;
+        $responseparamsencoded =
+            'serverName=' . $servername . '&externalUserKey=' . urlencode($userkey) . '&expiration=' . $expiration;
 
-        $separator = (strpos($callbackurl, '?') ? '&' : '?');
-        $redirecturl = $callbackurl . $separator . $responseparamsencoded . '&authCode=' . $responseauthcode;
+        $fullreturnurl = !empty($returnurl) ? '&ReturnUrl=' . $returnurl . $fragment : "";
+        $separator = (strpos($url, '?') ? '&' : '?');
+        $redirecturl = $url . $separator . $responseparamsencoded . '&authCode=' . $responseauthcode . $fullreturnurl;
 
         // Redirect to Panopto Focus login page.
         redirect($redirecturl);
diff --git a/block_panopto.php b/block_panopto.php
index 6b7419c..3b194ae 100644
--- a/block_panopto.php
+++ b/block_panopto.php
@@ -99,22 +99,21 @@ public function instance_config_save($data, $nolongerused = false) {
             $publisherroles,
             $creatorroles
         );
-        
+
         if (!empty($data->course)) {
 
             // Only perform this chunk if we are remapping to a new folder.
             $panoptodata = new \panopto_data($this->page->course->id);
-            
+
             if (strcasecmp($panoptodata->sessiongroupid, $data->course) != 0) {
                 $oldsessionid = null;
                 if (!empty($panoptodata->sessiongroupid)) {
                     $oldsessionid = $panoptodata->sessiongroupid;
                     $panoptodata->unprovision_course();
                 }
-
-
-                // Manually overwrite the sessiongroupid on this Panopto_Data instance so we can test provision the attempted new mapping. If the provision fails do not allow it.
-                //  Provision could fail if the user attempts to provision a personal folder.
+                // Manually overwrite the sessiongroupid on this Panopto_Data instance,
+                // so we can test provision the attempted new mapping.
+                // If the provision fails do not allow it. Provision could fail if the user attempts to provision a personal folder.
                 $panoptodata->sessiongroupid = $data->course;
 
                 $provisioninginfo = $panoptodata->get_provisioning_info();
@@ -142,7 +141,7 @@ public function cron() {
      * Generate HTML for block contents.
      */
     public function get_content() {
-        global $COURSE, $PAGE;
+        global $COURSE;
 
         if ($this->content !== null) {
             return $this->content;
@@ -157,7 +156,7 @@ public function get_content() {
 
         $params = array('id' => self::CONTENTID, 'courseid' => $COURSE->id);
 
-        $PAGE->requires->yui_module('moodle-block_panopto-asyncload',
+        $this->page->requires->yui_module('moodle-block_panopto-asyncload',
                                     'M.block_panopto.asyncload.init',
                                     array($params),
                                     null,
@@ -193,7 +192,7 @@ public function get_content() {
                         'var showAllToggle = document.getElementById("showAllToggle");' .
                         'var hiddenLecturesDiv = document.getElementById("hiddenLecturesDiv");' .
 
-                        'if(hiddenLecturesDiv.style.display == "block") {' .
+                        'if (hiddenLecturesDiv.style.display == "block") {' .
                             'hiddenLecturesDiv.style.display = "none";' .
                             'showAllToggle.innerHTML = "' . get_string('show_all', 'block_panopto') . '";' .
                         '} else {' .
@@ -211,13 +210,13 @@ public function get_content() {
      * @return array
      */
     public function applicable_formats() {
-        // Since block is dealing with courses and enrolments the only possible.
+        // Since block is dealing with courses and enrollment's the only possible.
         // place where Panopto block can be used is the course.
         return array('course-view' => true);
     }
 
     /**
-     * allow more than one instance of the block on a page
+     * Allow more than one instance of the block on a page
      *
      * @return boolean
      */
diff --git a/build_category_structure.php b/build_category_structure.php
index f689379..095dc8f 100644
--- a/build_category_structure.php
+++ b/build_category_structure.php
@@ -15,7 +15,7 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * the code used to build the Moodle category structure on Panopto
+ * The code used to build the Moodle category structure on Panopto
  *
  * @package block_panopto
  * @copyright  Panopto 2009 - 2017
@@ -67,7 +67,10 @@
 require_login();
 
 /**
- * The category structure process workhorse funciton
+ * The category structure process workhorse function
+ *
+ * @param string $selectedserver server name
+ * @param string $selectedkey selected key
  */
 function build_category_structure($selectedserver, $selectedkey) {
     global $DB;
@@ -124,7 +127,7 @@ function build_category_structure($selectedserver, $selectedkey) {
 
         echo "<a href='$returnurl'>" . get_string('back_to_config', 'block_panopto') . '</a>';
     } else {
-       $mform->display(); 
+        $mform->display();
     }
 
     echo $OUTPUT->footer();
diff --git a/classes/admin/trim_configtext.php b/classes/admin/trim_configtext.php
index 9bc5217..65ff00a 100644
--- a/classes/admin/trim_configtext.php
+++ b/classes/admin/trim_configtext.php
@@ -15,7 +15,7 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * a new admin setting that trims any input.
+ * A new admin setting that trims any input.
  *
  * @package block_panopto
  * @copyright Panopto 2009 - 2016 /With contributions from Spenser Jones (sjones@ambrose.edu),
@@ -23,8 +23,6 @@
  * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
-defined('MOODLE_INTERNAL') || die();
-
 /**
  * Text input that trims any extra whitespace.
  * @copyright Panopto 2016
@@ -49,7 +47,7 @@ public function __construct($name, $visiblename, $description, $defaultsetting,
     }
 
     /**
-     * write data to storage
+     * Write data to storage
      *
      * @param string $data the data being written.
      */
@@ -59,7 +57,7 @@ public function write_setting($data) {
             $data = 0;
         }
 
-        // ...$data is a string.
+        // The ...$data is a string.
         $trimmeddata = trim($data);
         $validated = $this->validate($trimmeddata);
         if ($validated !== true) {
diff --git a/classes/categorytasks.php b/classes/categorytasks.php
index b72343a..50af54d 100644
--- a/classes/categorytasks.php
+++ b/classes/categorytasks.php
@@ -15,7 +15,7 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * adds category tasks to the Panopto plugin
+ * Adds category tasks to the Panopto plugin
  *
  * @package block_panopto
  * @copyright Panopto 2009 - 2018
@@ -38,13 +38,14 @@
  * When a category is moved or updated: course_category_updated is called
  */
 class block_panopto_categorytasks {
+
     /**
      * Called when a category has been created
      *
-     * @param \core\event\course_category_updated $event
+     * @param \core\event\course_category_created $event
      */
     public static function coursecategorycreated(\core\event\course_category_created $event) {
-        
+
         if (!\panopto_data::is_main_block_configured() ||
             !\panopto_data::has_minimum_version()) {
             return;
diff --git a/classes/panopto_build_category_structure_form.php b/classes/panopto_build_category_structure_form.php
index 831427b..f860113 100644
--- a/classes/panopto_build_category_structure_form.php
+++ b/classes/panopto_build_category_structure_form.php
@@ -13,15 +13,18 @@
 //
 // You should have received a copy of the GNU General Public License
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+defined('MOODLE_INTERNAL') || die();
+
+require_once($CFG->libdir . '/formslib.php');
+
 /**
- * the form wrapper used to build the Moodle category structure on Panopto
+ * The form wrapper used to build the Moodle category structure on Panopto
  *
  * @package block_panopto
  * @copyright  Panopto 2020
  * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-require_once($CFG->libdir . '/formslib.php');
-
 class panopto_build_category_structure_form extends moodleform {
 
     /**
diff --git a/classes/panopto_provision_form.php b/classes/panopto_provision_form.php
index ca4ac4b..10c84b2 100644
--- a/classes/panopto_provision_form.php
+++ b/classes/panopto_provision_form.php
@@ -13,6 +13,11 @@
 //
 // You should have received a copy of the GNU General Public License
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+defined('MOODLE_INTERNAL') || die();
+
+require_once($CFG->libdir . '/formslib.php');
+
 /**
  * Create form for server selection for bulk course provisioning
  *
@@ -20,8 +25,6 @@
  * @copyright  Panopto 2020
  * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-require_once($CFG->libdir . '/formslib.php');
-
 class panopto_provision_form extends moodleform {
 
     /**
diff --git a/classes/panopto_rename_all_folders_form.php b/classes/panopto_rename_all_folders_form.php
index 994b9a5..2218fcb 100644
--- a/classes/panopto_rename_all_folders_form.php
+++ b/classes/panopto_rename_all_folders_form.php
@@ -14,6 +14,10 @@
 // You should have received a copy of the GNU General Public License
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
+defined('MOODLE_INTERNAL') || die();
+
+require_once($CFG->libdir . '/formslib.php');
+
 /**
  * Form to update all currently mapped Panopto folder names to match their mapped course name
  *
@@ -21,8 +25,6 @@
  * @copyright  Panopto 2020
  * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-require_once($CFG->libdir . '/formslib.php');
-
 class panopto_rename_all_folders_form extends moodleform {
 
     /**
diff --git a/classes/panopto_unprovision_course_form.php b/classes/panopto_unprovision_course_form.php
index 3662372..f6c3453 100644
--- a/classes/panopto_unprovision_course_form.php
+++ b/classes/panopto_unprovision_course_form.php
@@ -13,6 +13,7 @@
 //
 // You should have received a copy of the GNU General Public License
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
 /**
  * Create form for server selection.
  *
diff --git a/classes/panopto_unprovision_form.php b/classes/panopto_unprovision_form.php
index 7848c9e..6475c5a 100644
--- a/classes/panopto_unprovision_form.php
+++ b/classes/panopto_unprovision_form.php
@@ -13,9 +13,11 @@
 //
 // You should have received a copy of the GNU General Public License
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
 /**
  * Create form for course unprovision.
  *
+ * @package block_panopto
  * @copyright  Panopto 2020
  * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
@@ -39,8 +41,8 @@ public function definition() {
         global $DB;
 
         $mform = & $this->_form;
-        
-        // Get all categories with no children (all leaf nodes)
+
+        // Get all categories with no children (all leaf nodes).
         $coursesraw = $DB->get_records_sql(
             'SELECT id, shortname, fullname FROM {course} WHERE id IN (SELECT moodleid FROM {block_panopto_foldermap})'
         );
diff --git a/classes/panopto_upgrade_all_folders_form.php b/classes/panopto_upgrade_all_folders_form.php
index b8458e1..3f920ec 100644
--- a/classes/panopto_upgrade_all_folders_form.php
+++ b/classes/panopto_upgrade_all_folders_form.php
@@ -14,6 +14,10 @@
 // You should have received a copy of the GNU General Public License
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
+defined('MOODLE_INTERNAL') || die();
+
+require_once($CFG->libdir . '/formslib.php');
+
 /**
  * Form for the Generation 1 to Generation 2 Panopto upgrade
  *
@@ -21,8 +25,6 @@
  * @copyright  Panopto 2020
  * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-require_once($CFG->libdir . '/formslib.php');
-
 class panopto_upgrade_all_folders_form extends moodleform {
 
     /**
diff --git a/classes/privacy/provider.php b/classes/privacy/provider.php
index 0ab7533..4c1c20a 100644
--- a/classes/privacy/provider.php
+++ b/classes/privacy/provider.php
@@ -1,30 +1,67 @@
 <?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * Provider for storing users data.
+ *
+ * @package block_panopto
+ * @copyright Panopto 2009 - 2018
+ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
 
 namespace block_panopto\privacy;
 
+defined('MOODLE_INTERNAL') || die();
+
 require_once(dirname(__FILE__) . '/../../lib/panopto_data.php');
 
 use \core_privacy\local\metadata\collection;
- 
+
 if (interface_exists('\core_privacy\local\request\userlist')) {
-    interface my_userlist extends \core_privacy\local\request\userlist{}
+    interface my_userlist extends \core_privacy\local\request\userlist {
+    }
 } else {
-    interface my_userlist {};
-} 
+    interface my_userlist {
+    };
+}
 
 if (interface_exists('\core_privacy\local\request\core_userlist_provider')) {
-    interface my_userlist_provider extends \core_privacy\local\request\core_userlist_provider{}
+    interface my_userlist_provider extends \core_privacy\local\request\core_userlist_provider {
+    }
 } else {
-    interface my_userlist_provider {};
+    interface my_userlist_provider {
+    };
 }
 
 if (interface_exists('\core_privacy\local\request\core_user_data_provider')) {
-    interface my_userdataprovider extends \core_privacy\local\request\core_user_data_provider{}
+    interface my_userdataprovider extends \core_privacy\local\request\core_user_data_provider {
+    }
 } else {
-    interface my_userdataprovider {};
+    interface my_userdataprovider {
+    };
 }
 
-class provider implements 
+/**
+ * Provider that stores user data.
+ *
+ * @package block_panopto
+ * @copyright  Panopto 2020
+ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+class provider implements
         // This plugin does store personal user data.
         \core_privacy\local\metadata\provider,
         \core_privacy\local\request\data_provider,
@@ -32,7 +69,12 @@ class provider implements
         my_userdataprovider,
         my_userlist_provider,
         my_userlist {
-    
+
+    /**
+     * Get metadata
+     *
+     * @param collection $collection
+     */
     public static function get_metadata(collection $collection) : collection {
         $collection->add_external_location_link('block_panopto', [
             'firstname' => 'privacy:metadata:block_panopto:firstname',
@@ -46,15 +88,15 @@ public static function get_metadata(collection $collection) : collection {
     /**
      * Get the list of contexts that contain user information for the specified user.
      *
-     * @param   int           $userid       The user to search.
-     * @return  contextlist   $contextlist  The list of contexts used in this plugin.
+     * @param int $userid the user to search.
+     * @return contextlist $contextlist the list of contexts used in this plugin.
      */
     public static function get_contexts_for_userid(int $userid) : \core_privacy\local\request\contextlist {
         $contextlist = new \core_privacy\local\request\contextlist();
- 
+
         $currentcourses = \enrol_get_users_courses($userid, true);
 
-        foreach($currentcourses as $currentcourse) {
+        foreach ($currentcourses as $currentcourse) {
             $currentpanopto = new \panopto_data($currentcourse->id);
             if ($currentpanopto->has_valid_panopto()) {
                 $contextlist->add_from_sql(
@@ -65,18 +107,18 @@ public static function get_contexts_for_userid(int $userid) : \core_privacy\loca
 
         return $contextlist;
     }
- 
+
     /**
      * Get the list of users who have data within a context.
      *
-     * @param   userlist    $userlist   The userlist containing the list of users who have data in this context/plugin combination.
+     * @param userlist $userlist the userlist containing the list of users who have data in this context/plugin combination.
      */
     public static function get_users_in_context(\core_privacy\local\request\userlist $userlist) {
         $context = $userlist->get_context();
 
         if ($context->contextlevel != CONTEXT_COURSE) {
             return;
-        } 
+        }
 
         $enrolledusers = \get_enrolled_users($context);
         $enrolleduserids = array();
@@ -90,7 +132,7 @@ public static function get_users_in_context(\core_privacy\local\request\userlist
     /**
      * Export all user data for the specified user, in the specified contexts, using the supplied exporter instance.
      *
-     * @param   approved_contextlist    $contextlist    The approved contexts to export information for.
+     * @param approved_contextlist $contextlist the approved contexts to export information for.
      */
     public static function export_user_data(\core_privacy\local\request\approved_contextlist $contextlist) {
         $userinfo = $contextlist->get_user();
@@ -98,16 +140,15 @@ public static function export_user_data(\core_privacy\local\request\approved_con
         $allpanoptos = \panopto_get_valid_panopto_servers();
         $panoptouser = null;
 
-
         foreach ($allpanoptos as $currentpanoptoinfo) {
             $currentpanopto = new \panopto_data(null);
             $currentpanopto->servername = $currentpanoptoinfo->name;
             $currentpanopto->applicationkey = $currentpanoptoinfo->appkey;
 
-            // search for user in panopto, if they exist then export the below data, if they do not exist then skip.
+            // Search for user in panopto, if they exist then export the below data, if they do not exist then skip.
             $panoptouser = $currentpanopto->get_user_by_key($instancename . '\\' . $userinfo->username);
 
-            if ($panoptouser != null && 
+            if ($panoptouser != null &&
                 !\panopto_is_guid_empty($panoptouser->UserId) &&
                 \panopto_user_info_valid($panoptouser->FirstName) &&
                 \panopto_user_info_valid($panoptouser->LastName) &&
@@ -120,15 +161,15 @@ public static function export_user_data(\core_privacy\local\request\approved_con
                     'firstname' => $panoptouser->FirstName,
                     'lastname' => $panoptouser->LastName,
                     'email' => $panoptouser->Email
-                ]); 
+                ]);
             }
         }
     }
- 
+
     /**
      * Delete multiple users within a single context.
      *
-     * @param   approved_userlist       $userlist The approved context and user information to delete information for.
+     * @param approved_userlist $userlist the approved context and user information to delete information for.
      */
     public static function delete_data_for_users(\core_privacy\local\request\approved_userlist $userlist) {
         $panoptoservers = \panopto_get_valid_panopto_servers();
@@ -136,20 +177,20 @@ public static function delete_data_for_users(\core_privacy\local\request\approve
         $instancename = \get_config('block_panopto', 'instance_name');
 
         // Iterate through each Panopto server and delete the users from each one.
-        foreach($panoptoservers as $panoptoserver) {
+        foreach ($panoptoservers as $panoptoserver) {
             $currentpanopto = new \panopto_data(null);
             $currentpanopto->servername = $panoptoserver->name;
             $currentpanopto->applicationkey = $panoptoserver->appkey;
 
             $userids = array();
-            foreach($targetusers as $targetuser) {
-                // search for user in panopto, if they exist then export the below data, if they do not exist then skip.
+            foreach ($targetusers as $targetuser) {
+                // Search for user in panopto, if they exist then export the below data, if they do not exist then skip.
                 $panoptouser = $currentpanopto->get_user_by_key($instancename . '\\' . $targetuser->username);
 
                 if ($panoptouser != null && !\panopto_is_guid_empty($panoptouser->UserId)) {
-                    // Overwrite all of the existing user's current info with '--Deleted--'
+                    // Overwrite all of the existing user's current info with '--Deleted--'.
                     $currentpanopto->update_contact_info(
-                        $panoptouser->UserId, 
+                        $panoptouser->UserId,
                         "--Deleted--",
                         "--Deleted--",
                         "--Deleted--",
@@ -160,11 +201,10 @@ public static function delete_data_for_users(\core_privacy\local\request\approve
         }
     }
 
- 
     /**
      * Delete a single user in approved contexts
      *
-     * @param   approved_contextlist       $contextlist The approved context and user information to delete information for.
+     * @param approved_contextlist $contextlist the approved context and user information to delete information for.
      */
     public static function delete_data_for_user(\core_privacy\local\request\approved_contextlist $contextlist) {
         if (empty($contextlist->count())) {
@@ -176,18 +216,18 @@ public static function delete_data_for_user(\core_privacy\local\request\approved
         $instancename = \get_config('block_panopto', 'instance_name');
 
         // Iterate through each Panopto server and delete the users from each one.
-        foreach($panoptoservers as $panoptoserver) {
+        foreach ($panoptoservers as $panoptoserver) {
             $currentpanopto = new \panopto_data(null);
             $currentpanopto->servername = $panoptoserver->name;
             $currentpanopto->applicationkey = $panoptoserver->appkey;
 
-            // search for user in panopto, if they exist then export the below data, if they do not exist then skip.
+            // Search for user in panopto, if they exist then export the below data, if they do not exist then skip.
             $panoptouser = $currentpanopto->get_user_by_key($instancename . '\\' . $userinfo->username);
 
             if ($panoptouser != null && !\panopto_is_guid_empty($panoptouser->UserId)) {
-                // Overwrite all of the existing user's current info with '--Deleted--'
+                // Overwrite all of the existing user's current info with '--Deleted--'.
                 $currentpanopto->update_contact_info(
-                    $panoptouser->UserId, 
+                    $panoptouser->UserId,
                     "--Deleted--",
                     "--Deleted--",
                     "--Deleted--",
@@ -197,11 +237,10 @@ public static function delete_data_for_user(\core_privacy\local\request\approved
         }
     }
 
- 
     /**
      * Delete multiple users within a single context.
      *
-     * @param  contextlist       $contextlist The approved context and user information to delete information for.
+     * @param context $context the approved context and user information to delete information for.
      */
     public static function delete_data_for_all_users_in_context(\context $context) {
         if ($context->contextlevel != CONTEXT_COURSE) {
@@ -214,14 +253,14 @@ public static function delete_data_for_all_users_in_context(\context $context) {
             $enrolledusers = \get_enrolled_users($context);
             $instancename = \get_config('block_panopto', 'instance_name');
 
-            foreach($enrolledusers as $enrolleduser) {
-                // search for user in panopto, if they exist then export the below data, if they do not exist then skip.
+            foreach ($enrolledusers as $enrolleduser) {
+                // Search for user in panopto, if they exist then export the below data, if they do not exist then skip.
                 $panoptouser = $currentpanopto->get_user_by_key($instancename . '\\' . $enrolleduser->username);
 
                 if ($panoptouser != null && !\panopto_is_guid_empty($panoptouser->UserId)) {
-                    // Overwrite all of the existing user's current info with '--Deleted--'
+                    // Overwrite all of the existing user's current info with '--Deleted--'.
                     $currentpanopto->update_contact_info(
-                        $panoptouser->UserId, 
+                        $panoptouser->UserId,
                         "--Deleted--",
                         "--Deleted--",
                         "--Deleted--",
diff --git a/classes/rollingsync.php b/classes/rollingsync.php
index b2d54be..4215b32 100644
--- a/classes/rollingsync.php
+++ b/classes/rollingsync.php
@@ -15,7 +15,7 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * adds rolling sync capability to Panopto
+ * Adds rolling sync capability to Panopto
  *
  * @package block_panopto
  * @copyright Panopto 2009 - 2016 /With contributions from Spenser Jones (sjones@ambrose.edu),
@@ -60,20 +60,20 @@ public static function coursecreated(\core\event\course_created $event) {
         global $DB;
 
         if (get_config('block_panopto', 'auto_insert_lti_link_to_new_courses')) {
-            
-            // Get a matching LTI tool for the course. 
+
+            // Get a matching LTI tool for the course.
             $tool = \panoptoblock_lti_utility::get_course_tool($event->courseid);
 
             if (!empty($tool)) {
-                // default intro should be a folderview
-                $draftid_editor = file_get_submitted_draft_itemid('introeditor');
-                file_prepare_draft_area($draftid_editor, null, null, null, null, array('subdirs'=>true));
+                // Default intro should be a folderview.
+                $draftideditor = file_get_submitted_draft_itemid('introeditor');
+                file_prepare_draft_area($draftideditor, null, null, null, null, array('subdirs' => true));
 
                 $moduleinfo = new stdClass();
                 $moduleinfo->modulename = 'lti';
                 $moduleinfo->course = $event->courseid;
                 $moduleinfo->section = 0;
-                $moduleinfo->name = 'Panopto Course Tool';
+                $moduleinfo->name = get_string('panopto_course_tool', 'block_panopto');
                 $moduleinfo->title = $tool->name;
                 $moduleinfo->typeid = $tool->id;
                 $moduleinfo->showdescriptionlaunch = false;
@@ -82,7 +82,7 @@ public static function coursecreated(\core\event\course_created $event) {
                 $moduleinfo->visible = true;
                 $moduleinfo->intro = '';
                 $moduleinfo->icon = 'https://static-contents.panopto.com/prod/panopto_logo_moodle_tool_60x60.png';
-                $moduleinfo->introeditor = array('text'=> $moduleinfo->intro, 'format'=>FORMAT_HTML, 'itemid'=>$draftid_editor);
+                $moduleinfo->introeditor = array('text' => $moduleinfo->intro, 'format' => FORMAT_HTML, 'itemid' => $draftideditor);
                 create_module($moduleinfo);
             }
         }
@@ -101,7 +101,6 @@ public static function coursecreated(\core\event\course_created $event) {
             $page->blocks->add_blocks(array(BLOCK_POS_LEFT => array('panopto')), $pagetypepattern);
         }
 
-
         if (!\panopto_data::is_main_block_configured() ||
             !\panopto_data::has_minimum_version()) {
             return;
@@ -154,7 +153,7 @@ public static function courserestored(\core\event\course_restored $event) {
             $panoptodata = new \panopto_data($newcourseid);
             $originalpanoptodata = new \panopto_data($originalcourseid);
 
-            // We should only perform the import if both the target and the source course are provisioned in panopto
+            // We should only perform the import if both the target and the source course are provisioned in panopto.
             if (isset($panoptodata->servername) && !empty($panoptodata->servername) &&
                 isset($panoptodata->applicationkey) && !empty($panoptodata->applicationkey) &&
                 isset($panoptodata->sessiongroupid) && !empty($panoptodata->sessiongroupid) &&
@@ -165,14 +164,14 @@ public static function courserestored(\core\event\course_restored $event) {
                 $panoptodata->ensure_auth_manager();
                 $activepanoptoserverversion = $panoptodata->authmanager->get_server_version();
                 $useccv2 = version_compare(
-                    $activepanoptoserverversion, 
-                    \panopto_data::$ccv2requiredpanoptoversion, 
+                    $activepanoptoserverversion,
+                    \panopto_data::$ccv2requiredpanoptoversion,
                     '>='
                 );
 
-                if($useccv2)
+                if ($useccv2) {
                     $panoptodata->copy_panopto_content($originalcourseid);
-                else {
+                } else {
                     $panoptodata->init_and_sync_import_ccv1($originalcourseid);
                 }
             }
@@ -230,7 +229,7 @@ public static function userenrolmentupdated(\core\event\user_enrolment_updated $
     /**
      * Called when a user has been enrolled.
      *
-     * @param \core\event\user_enrolment_created $event
+     * @param \core\event\role_assigned $event
      */
     public static function roleassigned(core\event\role_assigned $event) {
         if (!\panopto_data::is_main_block_configured() ||
@@ -256,7 +255,7 @@ public static function roleassigned(core\event\role_assigned $event) {
     /**
      * Called when a user enrollment has been updated.
      *
-     * @param \core\event\user_enrolment_updated $event
+     * @param \core\event\role_unassigned $event
      */
     public static function roleunassigned(core\event\role_unassigned $event) {
         if (!\panopto_data::is_main_block_configured() ||
@@ -306,7 +305,8 @@ public static function userloggedin(\core\event\user_loggedin $event) {
     }
 
     /**
-     * Called when a user has logged in as a different user, this will sync the sub user being logged in as, not the admin user performing the action.
+     * Called when a user has logged in as a different user.
+     * This will sync the sub user being logged in as, not the admin user performing the action.
      *
      * @param \core\event\user_loggedinas $event
      */
diff --git a/classes/task/ensure_category.php b/classes/task/ensure_category.php
index 519bb62..eca0622 100644
--- a/classes/task/ensure_category.php
+++ b/classes/task/ensure_category.php
@@ -14,7 +14,9 @@
 // You should have received a copy of the GNU General Public License
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 /**
- * the ensure category class for Panopto, this will build a set of folders in panopto matching the given category and it's parent categories.
+ * The ensure category class for Panopto.
+ *
+ * This will build a set of folders in Panopto matching the given category and it's parent categories.
  *
  * @package block_panopto
  * @copyright Panopto 2009 - 2016
@@ -26,8 +28,11 @@
 
 require_once(dirname(__FILE__) . '/../../lib/panopto_data.php');
 require_once(dirname(__FILE__) . '/../../lib/panopto_category_data.php');
+
 /**
- * Panopto "ensure category" task. This task will build a set of folders in panopto matching the given category and it's parent categories.
+ * Panopto "ensure category" task.
+ *
+ * This task will build a set of folders in Panopto matching the given category and it's parent categories.
  *
  * @package block_panopto
  * @copyright Panopto 2009 - 2016 /With contributions
@@ -35,14 +40,14 @@
  */
 class ensure_category extends \core\task\adhoc_task {
     /**
-     * the the parent component for this class
+     * The the parent component for this class
      */
     public function get_component() {
         return 'block_panopto';
     }
-    
+
     /**
-     * the main execution function of the class
+     * The main execution function of the class
      */
     public function execute() {
         global $DB;
@@ -50,14 +55,14 @@ public function execute() {
         try {
             $eventdata = (array) $this->get_custom_data();
             $categoryid = $eventdata['categoryid'];
-            
+
             $targetserver = panopto_get_target_panopto_server();
             $serverpanopto = new \panopto_category_data($categoryid, $targetserver->name, $targetserver->appkey);
 
             // Sync the user to all courses mapped to the server.
             $serverpanopto->ensure_category_branch(false, null);
         } catch (Exception $e) {
-            \panopto_data::print_log(print_r($e->getMessage(), true));
+            \panopto_data::print_log($e->getMessage());
         }
     }
 }
diff --git a/classes/task/provision_course.php b/classes/task/provision_course.php
index 1818496..ad06739 100644
--- a/classes/task/provision_course.php
+++ b/classes/task/provision_course.php
@@ -15,7 +15,7 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * the provision course class for Panopto
+ * The provision course class for Panopto.
  *
  * @package block_panopto
  * @copyright Panopto 2009 - 2016 /With contributions from Spenser Jones (sjones@ambrose.edu),
@@ -31,20 +31,21 @@
 
 /**
  * Panopto "provision course" task.
+ *
  * @copyright Panopto 2009 - 2016 /With contributions from Spenser Jones (sjones@ambrose.edu),
  * Skylar Kelty <S.Kelty@kent.ac.uk>
  * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 class provision_course extends \core\task\adhoc_task {
     /**
-     * the the parent component for this class
+     * The the parent component for this class
      */
     public function get_component() {
         return 'block_panopto';
     }
 
     /**
-     * the main execution function of the class
+     * The main execution function of the class
      */
     public function execute() {
         try {
@@ -58,7 +59,7 @@ public function execute() {
             $provisioninginfo = $panopto->get_provisioning_info();
             $provisioneddata = $panopto->provision_course($provisioninginfo, false);
         } catch (Exception $e) {
-            \panopto_data::print_log(print_r($e->getMessage(), true));
+            \panopto_data::print_log($e->getMessage());
         }
     }
 }
diff --git a/classes/task/sync_user.php b/classes/task/sync_user.php
index 0d13c51..b8bb54e 100644
--- a/classes/task/sync_user.php
+++ b/classes/task/sync_user.php
@@ -14,7 +14,7 @@
 // You should have received a copy of the GNU General Public License
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 /**
- * the sync user class for Panopto, syncs user permissions with Panopto server, called on unenrollment event
+ * The sync user class for Panopto, syncs user permissions with Panopto server, called on unenrollment event.
  *
  * @package block_panopto
  * @copyright Panopto 2009 - 2016
@@ -23,20 +23,23 @@
 namespace block_panopto\task;
 defined('MOODLE_INTERNAL') || die();
 require_once(dirname(__FILE__) . '/../../lib/panopto_data.php');
+
 /**
  * Panopto "sync user" task.
+ *
  * @copyright Panopto 2009 - 2016 /With contributions
  * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 class sync_user extends \core\task\adhoc_task {
     /**
-     * the the parent component for this class
+     * The the parent component for this class
      */
     public function get_component() {
         return 'block_panopto';
     }
+
     /**
-     * the main execution function of the class
+     * The main execution function of the class
      */
     public function execute() {
         global $DB;
@@ -45,12 +48,14 @@ public function execute() {
             $eventdata = (array) $this->get_custom_data();
             $coursepanopto = new \panopto_data($eventdata['courseid']);
 
-            if (isset($coursepanopto->servername) && !empty($coursepanopto->servername) &&
-                isset($coursepanopto->applicationkey) && !empty($coursepanopto->applicationkey)) {
+            if (isset($coursepanopto->servername) &&
+                !empty($coursepanopto->servername) &&
+                isset($coursepanopto->applicationkey) &&
+                !empty($coursepanopto->applicationkey)) {
                 $coursepanopto->sync_external_user($eventdata['userid']);
             }
         } catch (Exception $e) {
-            \panopto_data::print_log(print_r($e->getMessage(), true));
+            \panopto_data::print_log($e->getMessage());
         }
     }
 }
diff --git a/classes/task/sync_user_login.php b/classes/task/sync_user_login.php
index efe317f..2089de9 100644
--- a/classes/task/sync_user_login.php
+++ b/classes/task/sync_user_login.php
@@ -14,7 +14,7 @@
 // You should have received a copy of the GNU General Public License
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 /**
- * the sync user class for Panopto, syncs user permissions with Panopto server, called on unenrollment event
+ * The sync user class for Panopto, syncs user permissions with Panopto server, called on unenrollment event.
  *
  * @package block_panopto
  * @copyright Panopto 2009 - 2016
@@ -23,27 +23,30 @@
 namespace block_panopto\task;
 defined('MOODLE_INTERNAL') || die();
 require_once(dirname(__FILE__) . '/../../lib/panopto_data.php');
+
 /**
  * Panopto "sync user login" task. This task syncs a user with all targeted Panopto servers.
+ *
  * @copyright Panopto 2009 - 2016 /With contributions
  * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 class sync_user_login extends \core\task\adhoc_task {
     /**
-     * the the parent component for this class
+     * The the parent component for this class
      */
     public function get_component() {
         return 'block_panopto';
     }
+
     /**
-     * the main execution function of the class
+     * The main execution function of the class
      */
     public function execute() {
         global $DB;
 
         try {
             $eventdata = (array) $this->get_custom_data();
-            
+
             if (empty($eventdata['targetserver'])) {
                 $targetserver = panopto_get_target_panopto_server();
             } else {
@@ -57,7 +60,7 @@ public function execute() {
             // Sync the user to all courses mapped to the server.
             $serverpanopto->sync_external_user($eventdata['userid']);
         } catch (Exception $e) {
-            \panopto_data::print_log(print_r($e->getMessage(), true));
+            \panopto_data::print_log($e->getMessage());
         }
     }
 }
diff --git a/db/access.php b/db/access.php
index aaa98ab..96a91d2 100644
--- a/db/access.php
+++ b/db/access.php
@@ -15,7 +15,7 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * file containing config and permissions for different roles
+ * File containing config and permissions for different roles.
  *
  * @package block_panopto
  * @copyright  Panopto 2009 - 2016 with contributions from Spenser Jones (sjones@ambrose.edu)
diff --git a/db/events.php b/db/events.php
index cdb6043..d783894 100644
--- a/db/events.php
+++ b/db/events.php
@@ -15,7 +15,7 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * contains the different events Panopto can expect to handle
+ * Contains the different events Panopto can expect to handle.
  *
  * @package block_panopto
  * @copyright  Panopto 2009 - 2016 with contributions from Spenser Jones (sjones@ambrose.edu)
diff --git a/db/upgrade.php b/db/upgrade.php
index be05d35..ef525fb 100644
--- a/db/upgrade.php
+++ b/db/upgrade.php
@@ -15,17 +15,15 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * Scripts used for upgrading database when upgrading block from an older version
+ * Scripts used for upgrading database when upgrading block from an older version.
  *
  * @package block_panopto
  * @copyright  Panopto 2009 - 2016 with contributions from Spenser Jones (sjones@ambrose.edu)
  * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
-defined('MOODLE_INTERNAL') || die();
-
 /**
- * Upgrades Panopto for xmldb
+ * Upgrades Panopto for xmldb.
  *
  * @param int $oldversion the previous version Panopto is being upgraded from
  */
@@ -244,13 +242,20 @@ function xmldb_block_panopto_upgrade($oldversion = 0) {
         $oldfoldermaptable = new xmldb_table('block_panopto_old_foldermap');
         if (!$dbman->table_exists($oldfoldermaptable)) {
             $mappingfields = array();
-            $mappingfields[] = new xmldb_field('id', XMLDB_TYPE_INTEGER, '10', XMLDB_UNSIGNED, XMLDB_NOTNULL, true);
-            $mappingfields[] = new xmldb_field('moodleid', XMLDB_TYPE_INTEGER, '10', XMLDB_UNSIGNED, XMLDB_NOTNULL, null, null, 'id');
-            $mappingfields[] = new xmldb_field('panopto_id', XMLDB_TYPE_CHAR, '36', null, XMLDB_NOTNULL, null, null, 'moodleid');
-            $mappingfields[] = new xmldb_field('panopto_server', XMLDB_TYPE_CHAR, '64', null, XMLDB_NOTNULL, null, null, 'panopto_id');
-            $mappingfields[] = new xmldb_field('panopto_app_key', XMLDB_TYPE_CHAR, '64', null, XMLDB_NOTNULL, null, null, 'panopto_server');
-            $mappingfields[] = new xmldb_field('publisher_mapping', XMLDB_TYPE_CHAR, '20', null, null, null, '1', 'panopto_app_key');
-            $mappingfields[] = new xmldb_field('creator_mapping', XMLDB_TYPE_CHAR, '20', null, null, null, '3,4', 'publisher_mapping');
+            $mappingfields[] =
+                new xmldb_field('id', XMLDB_TYPE_INTEGER, '10', XMLDB_UNSIGNED, XMLDB_NOTNULL, true);
+            $mappingfields[] =
+                new xmldb_field('moodleid', XMLDB_TYPE_INTEGER, '10', XMLDB_UNSIGNED, XMLDB_NOTNULL, null, null, 'id');
+            $mappingfields[] =
+                new xmldb_field('panopto_id', XMLDB_TYPE_CHAR, '36', null, XMLDB_NOTNULL, null, null, 'moodleid');
+            $mappingfields[] =
+                new xmldb_field('panopto_server', XMLDB_TYPE_CHAR, '64', null, XMLDB_NOTNULL, null, null, 'panopto_id');
+            $mappingfields[] =
+                new xmldb_field('panopto_app_key', XMLDB_TYPE_CHAR, '64', null, XMLDB_NOTNULL, null, null, 'panopto_server');
+            $mappingfields[] =
+                new xmldb_field('publisher_mapping', XMLDB_TYPE_CHAR, '20', null, null, null, '1', 'panopto_app_key');
+            $mappingfields[] =
+                new xmldb_field('creator_mapping', XMLDB_TYPE_CHAR, '20', null, null, null, '3,4', 'publisher_mapping');
             $mappingkey = new xmldb_key('primary', XMLDB_KEY_PRIMARY, array('id'), null, null);
             foreach ($mappingfields as $mappingfield) {
                 $oldfoldermaptable->addField($mappingfield);
@@ -268,7 +273,8 @@ function xmldb_block_panopto_upgrade($oldversion = 0) {
 
     if ($oldversion < 2018030200) {
 
-        // Since this toggle got changed/removed for a select, get the old value and if it's set then set the new feature as appropriate.
+        // Since this toggle got changed/removed for a select,
+        // get the old value and if it's set then set the new feature as appropriate.
         if (get_config('block_panopto', 'prefix_new_folder_names')) {
             set_config('folder_name_style', 'combination', 'block_panopto');
         }
@@ -279,14 +285,18 @@ function xmldb_block_panopto_upgrade($oldversion = 0) {
 
     if ($oldversion < 2019070100) {
 
-        // Define table table where we will place all of our category mappings. So we can know which categories are linked to Panopto folders.
+        // Define table table where we will place all of our category mappings.
+        // So we can know which categories are linked to Panopto folders.
         $categorymaptable = new xmldb_table('block_panopto_categorymap');
         if (!$dbman->table_exists($categorymaptable)) {
             $mappingfields = array();
             $mappingfields[] = new xmldb_field('id', XMLDB_TYPE_INTEGER, '10', XMLDB_UNSIGNED, XMLDB_NOTNULL, true);
-            $mappingfields[] = new xmldb_field('category_id', XMLDB_TYPE_INTEGER, '10', XMLDB_UNSIGNED, XMLDB_NOTNULL, null, null, 'id');
-            $mappingfields[] = new xmldb_field('panopto_id', XMLDB_TYPE_CHAR, '36', null, XMLDB_NOTNULL, null, null, 'category_id');
-            $mappingfields[] = new xmldb_field('panopto_server', XMLDB_TYPE_CHAR, '64', null, XMLDB_NOTNULL, null, null, 'panopto_id');
+            $mappingfields[] =
+                new xmldb_field('category_id', XMLDB_TYPE_INTEGER, '10', XMLDB_UNSIGNED, XMLDB_NOTNULL, null, null, 'id');
+            $mappingfields[] =
+                new xmldb_field('panopto_id', XMLDB_TYPE_CHAR, '36', null, XMLDB_NOTNULL, null, null, 'category_id');
+            $mappingfields[] =
+                new xmldb_field('panopto_server', XMLDB_TYPE_CHAR, '64', null, XMLDB_NOTNULL, null, null, 'panopto_id');
             $mappingkey = new xmldb_key('primary', XMLDB_KEY_PRIMARY, array('id'), null, null);
             foreach ($mappingfields as $mappingfield) {
                 $categorymaptable->addField($mappingfield);
@@ -294,7 +304,7 @@ function xmldb_block_panopto_upgrade($oldversion = 0) {
             $categorymaptable->addKey($mappingkey);
             $dbman->create_table($categorymaptable);
         }
-        
+
         // Panopto savepoint reached.
         upgrade_block_savepoint(true, 2019070100, 'panopto');
     }
@@ -311,7 +321,7 @@ function xmldb_block_panopto_upgrade($oldversion = 0) {
         if (get_config('block_panopto', 'prefix_new_folder_names')) {
             unset_config('prefix_new_folder_names', 'block_panopto');
         }
-        
+
         // Panopto savepoint reached.
         upgrade_block_savepoint(true, 2020072736, 'panopto');
     }
@@ -344,12 +354,10 @@ function xmldb_block_panopto_upgrade($oldversion = 0) {
             $targetidindex = new xmldb_index('mdl_blocpanoimpo_tar_ix', XMLDB_INDEX_NOTUNIQUE, array('target_moodle_id'), array());
             $importidindex = new xmldb_index('mdl_blocpanoimpo_imp_ix', XMLDB_INDEX_NOTUNIQUE, array('import_moodle_id'), array());
 
-
             if (!$dbman->index_exists($importmaptable, $targetidindex)) {
                 $dbman->add_index($importmaptable, $targetidindex);
             }
 
-
             if (!$dbman->index_exists($importmaptable, $importidindex)) {
                 $dbman->add_index($importmaptable, $importidindex);
             }
@@ -360,7 +368,6 @@ function xmldb_block_panopto_upgrade($oldversion = 0) {
         if ($dbman->table_exists($creatormaptable)) {
             $moodleidindex = new xmldb_index('mdl_blocpanocrea_moo_ix', XMLDB_INDEX_NOTUNIQUE, array('moodle_id'), array());
 
-
             if (!$dbman->index_exists($creatormaptable, $moodleidindex)) {
                 $dbman->add_index($creatormaptable, $moodleidindex);
             }
@@ -371,7 +378,6 @@ function xmldb_block_panopto_upgrade($oldversion = 0) {
         if ($dbman->table_exists($publishermaptable)) {
             $moodleidindex = new xmldb_index('mdl_blocpanopubl_moo_ix', XMLDB_INDEX_NOTUNIQUE, array('moodle_id'), array());
 
-
             if (!$dbman->index_exists($publishermaptable, $moodleidindex)) {
                 $dbman->add_index($publishermaptable, $moodleidindex);
             }
@@ -383,12 +389,10 @@ function xmldb_block_panopto_upgrade($oldversion = 0) {
             $moodleidindex = new xmldb_index('mdl_blocpanooldfold_moo_ix', XMLDB_INDEX_NOTUNIQUE, array('moodleid'), array());
             $serverindex = new xmldb_index('mdl_blocpanooldfold_pan_ix', XMLDB_INDEX_NOTUNIQUE, array('panopto_server'), array());
 
-
             if (!$dbman->index_exists($oldfoldermaptable, $moodleidindex)) {
                 $dbman->add_index($oldfoldermaptable, $moodleidindex);
             }
 
-
             if (!$dbman->index_exists($oldfoldermaptable, $serverindex)) {
                 $dbman->add_index($oldfoldermaptable, $serverindex);
             }
@@ -399,14 +403,13 @@ function xmldb_block_panopto_upgrade($oldversion = 0) {
         if ($dbman->table_exists($categorymaptable)) {
             $serverindex = new xmldb_index('mdl_blocpanocate_cat_ix', XMLDB_INDEX_NOTUNIQUE, array('category_id'), array());
 
-
             if (!$dbman->index_exists($categorymaptable, $serverindex)) {
                 $dbman->add_index($categorymaptable, $serverindex);
             }
         } else {
             return false;
         }
-        
+
         // Panopto savepoint reached.
         upgrade_block_savepoint(true, 2021063000, 'panopto');
     }
diff --git a/edit_form.php b/edit_form.php
index e1034bc..aad2521 100644
--- a/edit_form.php
+++ b/edit_form.php
@@ -15,7 +15,7 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * the edit form for the Panopto block
+ * The edit form for the Panopto block.
  *
  * @package block_panopto
  * @copyright  Panopto 2009 - 2016 /With contributions from Spenser Jones (sjones@ambrose.edu)
@@ -61,7 +61,11 @@ protected function specific_definition($mform) {
             $unprovisionurl = "$CFG->wwwroot/blocks/panopto/unprovision_course_internal.php?id=" . $COURSE->id;
             $unprovisionfrommoodle = get_string('unprovision_from_moodle', 'block_panopto');
             $or = get_string('or', 'block_panopto');
-            $mform->addElement('html', "<a href='$unprovisionurl'>$unprovisionfrommoodle</a><br><br>-- $or --<br><br><a href='$provisionurl'>$addtopanopto</a><br><br>-- $or --<br><br>");
+            $html = "<a href='$unprovisionurl'>$unprovisionfrommoodle</a><br><br>";
+            $html .= "-- $or --<br><br>";
+            $html .= "<a href='$provisionurl'>$addtopanopto</a><br><br>";
+            $html .= "-- $or --<br><br>";
+            $mform->addElement('html', $html);
 
             $courselist = $panoptodata->get_course_options();
 
@@ -111,7 +115,6 @@ protected function specific_definition($mform) {
             $mform->addElement('static', 'error', '', get_string('block_edit_error', 'block_panopto'));
         }
     }
-
 }
 
 /* End of file edit_form.php */
diff --git a/lang/en/block_panopto.php b/lang/en/block_panopto.php
index c7ded7f..3590a93 100644
--- a/lang/en/block_panopto.php
+++ b/lang/en/block_panopto.php
@@ -221,6 +221,7 @@
 $string['panopto:provision_asteacher'] = 'Provision as a teacher';
 $string['panopto:provision_course'] = 'Provision a course';
 $string['panopto:provision_multiple'] = 'Provision multiple courses at once';
+$string['panopto_course_tool'] = 'Panopto Course Tool';
 $string['panopto_server_error'] = 'Panopto server {$a} returned with server error, will try again on next sign in.';
 $string['pluginname'] = 'Panopto';
 $string['podcast_audio'] = 'Audio podcast';
diff --git a/lib/AuthManagement/AuthManagementWsdlClass.php b/lib/AuthManagement/AuthManagementWsdlClass.php
index 92986cf..15e18ce 100644
--- a/lib/AuthManagement/AuthManagementWsdlClass.php
+++ b/lib/AuthManagement/AuthManagementWsdlClass.php
@@ -253,8 +253,9 @@ public function __construct($_arrayOfValues = array(),$_resetSoapClient = true)
      * @param string $_className optional (used by inherited classes in order to always call this method)
      * @return AuthManagementWsdlClass|null
      */
-    public static function __set_state(array $_array,$_className = __CLASS__)
+    public static function __set_state(array $_array)
     {
+        $_className = __CLASS__;
         if(class_exists($_className))
         {
             $object = @new $_className();
diff --git a/lib/AuthManagement/Authentication/Info/AuthManagementStructAuthenticationInfo.php b/lib/AuthManagement/Authentication/Info/AuthManagementStructAuthenticationInfo.php
index 730d7af..3b1bcd1 100644
--- a/lib/AuthManagement/Authentication/Info/AuthManagementStructAuthenticationInfo.php
+++ b/lib/AuthManagement/Authentication/Info/AuthManagementStructAuthenticationInfo.php
@@ -135,9 +135,9 @@ public function setUserKey($_userKey)
      * @param array $_array the exported values
      * @return AuthManagementStructAuthenticationInfo
      */
-    public static function __set_state(array $_array,$_className = __CLASS__)
+    public static function __set_state(array $_array)
     {
-        return parent::__set_state($_array,$_className);
+        return parent::__set_state($_array);
     }
     /**
      * Method returning the class name
diff --git a/lib/AuthManagement/Get/Response/AuthManagementStructGetAuthenticatedUrlResponse.php b/lib/AuthManagement/Get/Response/AuthManagementStructGetAuthenticatedUrlResponse.php
index ca5b768..79edd00 100644
--- a/lib/AuthManagement/Get/Response/AuthManagementStructGetAuthenticatedUrlResponse.php
+++ b/lib/AuthManagement/Get/Response/AuthManagementStructGetAuthenticatedUrlResponse.php
@@ -83,9 +83,9 @@ public function setGetAuthenticatedUrlResult($_getAuthenticatedUrlResult)
      * @param array $_array the exported values
      * @return AuthManagementStructGetAuthenticatedUrlResponse
      */
-    public static function __set_state(array $_array,$_className = __CLASS__)
+    public static function __set_state(array $_array)
     {
-        return parent::__set_state($_array,$_className);
+        return parent::__set_state($_array);
     }
     /**
      * Method returning the class name
diff --git a/lib/AuthManagement/Get/Response/AuthManagementStructGetServerVersionResponse.php b/lib/AuthManagement/Get/Response/AuthManagementStructGetServerVersionResponse.php
index 74568b1..7578da0 100644
--- a/lib/AuthManagement/Get/Response/AuthManagementStructGetServerVersionResponse.php
+++ b/lib/AuthManagement/Get/Response/AuthManagementStructGetServerVersionResponse.php
@@ -83,9 +83,9 @@ public function setGetServerVersionResult($_getServerVersionResult)
      * @param array $_array the exported values
      * @return AuthManagementStructGetServerVersionResponse
      */
-    public static function __set_state(array $_array,$_className = __CLASS__)
+    public static function __set_state(array $_array)
     {
-        return parent::__set_state($_array,$_className);
+        return parent::__set_state($_array);
     }
     /**
      * Method returning the class name
diff --git a/lib/AuthManagement/Get/Url/AuthManagementStructGetAuthenticatedUrl.php b/lib/AuthManagement/Get/Url/AuthManagementStructGetAuthenticatedUrl.php
index 2a1456d..459278a 100644
--- a/lib/AuthManagement/Get/Url/AuthManagementStructGetAuthenticatedUrl.php
+++ b/lib/AuthManagement/Get/Url/AuthManagementStructGetAuthenticatedUrl.php
@@ -109,9 +109,9 @@ public function setTargetUrl($_targetUrl)
      * @param array $_array the exported values
      * @return AuthManagementStructGetAuthenticatedUrl
      */
-    public static function __set_state(array $_array,$_className = __CLASS__)
+    public static function __set_state(array $_array)
     {
-        return parent::__set_state($_array,$_className);
+        return parent::__set_state($_array);
     }
     /**
      * Method returning the class name
diff --git a/lib/AuthManagement/Log/Password/AuthManagementStructLogOnWithPassword.php b/lib/AuthManagement/Log/Password/AuthManagementStructLogOnWithPassword.php
index d0805b0..a2312f0 100644
--- a/lib/AuthManagement/Log/Password/AuthManagementStructLogOnWithPassword.php
+++ b/lib/AuthManagement/Log/Password/AuthManagementStructLogOnWithPassword.php
@@ -109,9 +109,9 @@ public function setPassword($_password)
      * @param array $_array the exported values
      * @return AuthManagementStructLogOnWithPassword
      */
-    public static function __set_state(array $_array,$_className = __CLASS__)
+    public static function __set_state(array $_array)
     {
-        return parent::__set_state($_array,$_className);
+        return parent::__set_state($_array);
     }
     /**
      * Method returning the class name
diff --git a/lib/AuthManagement/Log/Provider/AuthManagementStructLogOnWithExternalProvider.php b/lib/AuthManagement/Log/Provider/AuthManagementStructLogOnWithExternalProvider.php
index 2bdd418..5b9b091 100644
--- a/lib/AuthManagement/Log/Provider/AuthManagementStructLogOnWithExternalProvider.php
+++ b/lib/AuthManagement/Log/Provider/AuthManagementStructLogOnWithExternalProvider.php
@@ -109,9 +109,9 @@ public function setAuthCode($_authCode)
      * @param array $_array the exported values
      * @return AuthManagementStructLogOnWithExternalProvider
      */
-    public static function __set_state(array $_array,$_className = __CLASS__)
+    public static function __set_state(array $_array)
     {
-        return parent::__set_state($_array,$_className);
+        return parent::__set_state($_array);
     }
     /**
      * Method returning the class name
diff --git a/lib/AuthManagement/Log/Response/AuthManagementStructLogOnWithExternalProviderResponse.php b/lib/AuthManagement/Log/Response/AuthManagementStructLogOnWithExternalProviderResponse.php
index 4a0fc26..834550a 100644
--- a/lib/AuthManagement/Log/Response/AuthManagementStructLogOnWithExternalProviderResponse.php
+++ b/lib/AuthManagement/Log/Response/AuthManagementStructLogOnWithExternalProviderResponse.php
@@ -82,9 +82,9 @@ public function setLogOnWithExternalProviderResult($_logOnWithExternalProviderRe
      * @param array $_array the exported values
      * @return AuthManagementStructLogOnWithExternalProviderResponse
      */
-    public static function __set_state(array $_array,$_className = __CLASS__)
+    public static function __set_state(array $_array)
     {
-        return parent::__set_state($_array,$_className);
+        return parent::__set_state($_array);
     }
     /**
      * Method returning the class name
diff --git a/lib/AuthManagement/Log/Response/AuthManagementStructLogOnWithPasswordResponse.php b/lib/AuthManagement/Log/Response/AuthManagementStructLogOnWithPasswordResponse.php
index 0e5b06e..ced50bb 100644
--- a/lib/AuthManagement/Log/Response/AuthManagementStructLogOnWithPasswordResponse.php
+++ b/lib/AuthManagement/Log/Response/AuthManagementStructLogOnWithPasswordResponse.php
@@ -82,9 +82,9 @@ public function setLogOnWithPasswordResult($_logOnWithPasswordResult)
      * @param array $_array the exported values
      * @return AuthManagementStructLogOnWithPasswordResponse
      */
-    public static function __set_state(array $_array,$_className = __CLASS__)
+    public static function __set_state(array $_array)
     {
-        return parent::__set_state($_array,$_className);
+        return parent::__set_state($_array);
     }
     /**
      * Method returning the class name
diff --git a/lib/AuthManagement/Report/Info/AuthManagementStructReportIntegrationInfo.php b/lib/AuthManagement/Report/Info/AuthManagementStructReportIntegrationInfo.php
index 4b3b43a..6f91225 100644
--- a/lib/AuthManagement/Report/Info/AuthManagementStructReportIntegrationInfo.php
+++ b/lib/AuthManagement/Report/Info/AuthManagementStructReportIntegrationInfo.php
@@ -161,9 +161,9 @@ public function setTargetPlatformVersion($_targetPlatformVersion)
      * @param array $_array the exported values
      * @return AuthManagementStructReportIntegrationInfo
      */
-    public static function __set_state(array $_array,$_className = __CLASS__)
+    public static function __set_state(array $_array)
     {
-        return parent::__set_state($_array,$_className);
+        return parent::__set_state($_array);
     }
     /**
      * Method returning the class name
diff --git a/lib/SessionManagement/Add/Folder/SessionManagementStructAddFolder.php b/lib/SessionManagement/Add/Folder/SessionManagementStructAddFolder.php
index 6d47ab1..180fa7a 100644
--- a/lib/SessionManagement/Add/Folder/SessionManagementStructAddFolder.php
+++ b/lib/SessionManagement/Add/Folder/SessionManagementStructAddFolder.php
@@ -161,9 +161,9 @@ public function setIsPublic($_isPublic)
      * @param array $_array the exported values
      * @return SessionManagementStructAddFolder
      */
-    public static function __set_state(array $_array,$_className = __CLASS__)
+    public static function __set_state(array $_array)
     {
-        return parent::__set_state($_array,$_className);
+        return parent::__set_state($_array);
     }
     /**
      * Method returning the class name
diff --git a/lib/SessionManagement/Add/Response/SessionManagementStructAddFolderResponse.php b/lib/SessionManagement/Add/Response/SessionManagementStructAddFolderResponse.php
index 7ae73b3..f055e04 100644
--- a/lib/SessionManagement/Add/Response/SessionManagementStructAddFolderResponse.php
+++ b/lib/SessionManagement/Add/Response/SessionManagementStructAddFolderResponse.php
@@ -83,9 +83,9 @@ public function setAddFolderResult($_addFolderResult)
      * @param array $_array the exported values
      * @return SessionManagementStructAddFolderResponse
      */
-    public static function __set_state(array $_array,$_className = __CLASS__)
+    public static function __set_state(array $_array)
     {
-        return parent::__set_state($_array,$_className);
+        return parent::__set_state($_array);
     }
     /**
      * Method returning the class name
diff --git a/lib/SessionManagement/Add/Response/SessionManagementStructAddSessionResponse.php b/lib/SessionManagement/Add/Response/SessionManagementStructAddSessionResponse.php
index 71b7785..ecc82a6 100644
--- a/lib/SessionManagement/Add/Response/SessionManagementStructAddSessionResponse.php
+++ b/lib/SessionManagement/Add/Response/SessionManagementStructAddSessionResponse.php
@@ -83,9 +83,9 @@ public function setAddSessionResult($_addSessionResult)
      * @param array $_array the exported values
      * @return SessionManagementStructAddSessionResponse
      */
-    public static function __set_state(array $_array,$_className = __CLASS__)
+    public static function __set_state(array $_array)
     {
-        return parent::__set_state($_array,$_className);
+        return parent::__set_state($_array);
     }
     /**
      * Method returning the class name
diff --git a/lib/SessionManagement/Add/Session/SessionManagementStructAddSession.php b/lib/SessionManagement/Add/Session/SessionManagementStructAddSession.php
index 0620cca..cace73b 100644
--- a/lib/SessionManagement/Add/Session/SessionManagementStructAddSession.php
+++ b/lib/SessionManagement/Add/Session/SessionManagementStructAddSession.php
@@ -160,9 +160,9 @@ public function setIsBroadcast($_isBroadcast)
      * @param array $_array the exported values
      * @return SessionManagementStructAddSession
      */
-    public static function __set_state(array $_array,$_className = __CLASS__)
+    public static function __set_state(array $_array)
     {
-        return parent::__set_state($_array,$_className);
+        return parent::__set_state($_array);
     }
     /**
      * Method returning the class name
diff --git a/lib/SessionManagement/Are/Public/SessionManagementStructAreUsersNotesPublic.php b/lib/SessionManagement/Are/Public/SessionManagementStructAreUsersNotesPublic.php
index b416eb6..e09adf9 100644
--- a/lib/SessionManagement/Are/Public/SessionManagementStructAreUsersNotesPublic.php
+++ b/lib/SessionManagement/Are/Public/SessionManagementStructAreUsersNotesPublic.php
@@ -135,9 +135,9 @@ public function setSessionId($_sessionId)
      * @param array $_array the exported values
      * @return SessionManagementStructAreUsersNotesPublic
      */
-    public static function __set_state(array $_array,$_className = __CLASS__)
+    public static function __set_state(array $_array)
     {
-        return parent::__set_state($_array,$_className);
+        return parent::__set_state($_array);
     }
     /**
      * Method returning the class name
diff --git a/lib/SessionManagement/Are/Response/SessionManagementStructAreUsersNotesPublicResponse.php b/lib/SessionManagement/Are/Response/SessionManagementStructAreUsersNotesPublicResponse.php
index c041a56..5ecd99e 100644
--- a/lib/SessionManagement/Are/Response/SessionManagementStructAreUsersNotesPublicResponse.php
+++ b/lib/SessionManagement/Are/Response/SessionManagementStructAreUsersNotesPublicResponse.php
@@ -82,9 +82,9 @@ public function setAreUsersNotesPublicResult($_areUsersNotesPublicResult)
      * @param array $_array the exported values
      * @return SessionManagementStructAreUsersNotesPublicResponse
      */
-    public static function __set_state(array $_array,$_className = __CLASS__)
+    public static function __set_state(array $_array)
     {
-        return parent::__set_state($_array,$_className);
+        return parent::__set_state($_array);
     }
     /**
      * Method returning the class name
diff --git a/lib/SessionManagement/Array/Context/SessionManagementStructArrayOfFolderWithExternalContext.php b/lib/SessionManagement/Array/Context/SessionManagementStructArrayOfFolderWithExternalContext.php
index 20ac03c..e798cea 100644
--- a/lib/SessionManagement/Array/Context/SessionManagementStructArrayOfFolderWithExternalContext.php
+++ b/lib/SessionManagement/Array/Context/SessionManagementStructArrayOfFolderWithExternalContext.php
@@ -140,9 +140,9 @@ public function getAttributeName()
      * @param array $_array the exported values
      * @return SessionManagementStructArrayOfFolderWithExternalContext
      */
-    public static function __set_state(array $_array,$_className = __CLASS__)
+    public static function __set_state(array $_array)
     {
-        return parent::__set_state($_array,$_className);
+        return parent::__set_state($_array);
     }
     /**
      * Method returning the class name
diff --git a/lib/SessionManagement/Array/Folder/SessionManagementStructArrayOfFolder.php b/lib/SessionManagement/Array/Folder/SessionManagementStructArrayOfFolder.php
index 5f316fc..90778fe 100644
--- a/lib/SessionManagement/Array/Folder/SessionManagementStructArrayOfFolder.php
+++ b/lib/SessionManagement/Array/Folder/SessionManagementStructArrayOfFolder.php
@@ -140,9 +140,9 @@ public function getAttributeName()
      * @param array $_array the exported values
      * @return SessionManagementStructArrayOfFolder
      */
-    public static function __set_state(array $_array,$_className = __CLASS__)
+    public static function __set_state(array $_array)
     {
-        return parent::__set_state($_array,$_className);
+        return parent::__set_state($_array);
     }
     /**
      * Method returning the class name
diff --git a/lib/SessionManagement/Array/Note/SessionManagementStructArrayOfNote.php b/lib/SessionManagement/Array/Note/SessionManagementStructArrayOfNote.php
index 54edce4..c6fefcc 100644
--- a/lib/SessionManagement/Array/Note/SessionManagementStructArrayOfNote.php
+++ b/lib/SessionManagement/Array/Note/SessionManagementStructArrayOfNote.php
@@ -140,9 +140,9 @@ public function getAttributeName()
      * @param array $_array the exported values
      * @return SessionManagementStructArrayOfNote
      */
-    public static function __set_state(array $_array,$_className = __CLASS__)
+    public static function __set_state(array $_array)
     {
-        return parent::__set_state($_array,$_className);
+        return parent::__set_state($_array);
     }
     /**
      * Method returning the class name
diff --git a/lib/SessionManagement/Array/OfExternalHierarchyInfo/SessionManagementStructArrayOfExternalHierarchyInfo.php b/lib/SessionManagement/Array/OfExternalHierarchyInfo/SessionManagementStructArrayOfExternalHierarchyInfo.php
index 8312259..f2ab2b0 100644
--- a/lib/SessionManagement/Array/OfExternalHierarchyInfo/SessionManagementStructArrayOfExternalHierarchyInfo.php
+++ b/lib/SessionManagement/Array/OfExternalHierarchyInfo/SessionManagementStructArrayOfExternalHierarchyInfo.php
@@ -138,9 +138,9 @@ public function getAttributeName()
      * @param array $_array the exported values
      * @return SessionManagementStructArrayOfExternalHierarchyInfo
      */
-    public static function __set_state(array $_array,$_className = __CLASS__)
+    public static function __set_state(array $_array)
     {
-        return parent::__set_state($_array,$_className);
+        return parent::__set_state($_array);
     }
     /**
      * Method returning the class name
diff --git a/lib/SessionManagement/Array/Ofguid/SessionManagementStructArrayOfguid.php b/lib/SessionManagement/Array/Ofguid/SessionManagementStructArrayOfguid.php
index 991d5b4..adf6c8a 100644
--- a/lib/SessionManagement/Array/Ofguid/SessionManagementStructArrayOfguid.php
+++ b/lib/SessionManagement/Array/Ofguid/SessionManagementStructArrayOfguid.php
@@ -140,9 +140,9 @@ public function getAttributeName()
      * @param array $_array the exported values
      * @return SessionManagementStructArrayOfguid
      */
-    public static function __set_state(array $_array,$_className = __CLASS__)
+    public static function __set_state(array $_array)
     {
-        return parent::__set_state($_array,$_className);
+        return parent::__set_state($_array);
     }
     /**
      * Method returning the class name
diff --git a/lib/SessionManagement/Array/Ofstring/SessionManagementStructArrayOfstring.php b/lib/SessionManagement/Array/Ofstring/SessionManagementStructArrayOfstring.php
index dd2356b..77bf1ef 100644
--- a/lib/SessionManagement/Array/Ofstring/SessionManagementStructArrayOfstring.php
+++ b/lib/SessionManagement/Array/Ofstring/SessionManagementStructArrayOfstring.php
@@ -140,9 +140,9 @@ public function getAttributeName()
      * @param array $_array the exported values
      * @return SessionManagementStructArrayOfstring
      */
-    public static function __set_state(array $_array,$_className = __CLASS__)
+    public static function __set_state(array $_array)
     {
-        return parent::__set_state($_array,$_className);
+        return parent::__set_state($_array);
     }
     /**
      * Method returning the class name
diff --git a/lib/SessionManagement/Array/Role/SessionManagementStructArrayOfAccessRole.php b/lib/SessionManagement/Array/Role/SessionManagementStructArrayOfAccessRole.php
index 485dbb3..01b8beb 100644
--- a/lib/SessionManagement/Array/Role/SessionManagementStructArrayOfAccessRole.php
+++ b/lib/SessionManagement/Array/Role/SessionManagementStructArrayOfAccessRole.php
@@ -150,9 +150,9 @@ public function getAttributeName()
      * @param array $_array the exported values
      * @return SessionManagementStructArrayOfAccessRole
      */
-    public static function __set_state(array $_array,$_className = __CLASS__)
+    public static function __set_state(array $_array)
     {
-        return parent::__set_state($_array,$_className);
+        return parent::__set_state($_array);
     }
     /**
      * Method returning the class name
diff --git a/lib/SessionManagement/Array/Session/SessionManagementStructArrayOfSession.php b/lib/SessionManagement/Array/Session/SessionManagementStructArrayOfSession.php
index 72d0707..791e6b9 100644
--- a/lib/SessionManagement/Array/Session/SessionManagementStructArrayOfSession.php
+++ b/lib/SessionManagement/Array/Session/SessionManagementStructArrayOfSession.php
@@ -140,9 +140,9 @@ public function getAttributeName()
      * @param array $_array the exported values
      * @return SessionManagementStructArrayOfSession
      */
-    public static function __set_state(array $_array,$_className = __CLASS__)
+    public static function __set_state(array $_array)
     {
-        return parent::__set_state($_array,$_className);
+        return parent::__set_state($_array);
     }
     /**
      * Method returning the class name
diff --git a/lib/SessionManagement/Array/Settings/SessionManagementStructArrayOfFolderAvailabilitySettings.php b/lib/SessionManagement/Array/Settings/SessionManagementStructArrayOfFolderAvailabilitySettings.php
index 61e6dd7..76c0027 100644
--- a/lib/SessionManagement/Array/Settings/SessionManagementStructArrayOfFolderAvailabilitySettings.php
+++ b/lib/SessionManagement/Array/Settings/SessionManagementStructArrayOfFolderAvailabilitySettings.php
@@ -140,9 +140,9 @@ public function getAttributeName()
      * @param array $_array the exported values
      * @return SessionManagementStructArrayOfFolderAvailabilitySettings
      */
-    public static function __set_state(array $_array,$_className = __CLASS__)
+    public static function __set_state(array $_array)
     {
-        return parent::__set_state($_array,$_className);
+        return parent::__set_state($_array);
     }
     /**
      * Method returning the class name
diff --git a/lib/SessionManagement/Array/Settings/SessionManagementStructArrayOfSessionAvailabilitySettings.php b/lib/SessionManagement/Array/Settings/SessionManagementStructArrayOfSessionAvailabilitySettings.php
index 1f91947..7d6ad93 100644
--- a/lib/SessionManagement/Array/Settings/SessionManagementStructArrayOfSessionAvailabilitySettings.php
+++ b/lib/SessionManagement/Array/Settings/SessionManagementStructArrayOfSessionAvailabilitySettings.php
@@ -140,9 +140,9 @@ public function getAttributeName()
      * @param array $_array the exported values
      * @return SessionManagementStructArrayOfSessionAvailabilitySettings
      */
-    public static function __set_state(array $_array,$_className = __CLASS__)
+    public static function __set_state(array $_array)
     {
-        return parent::__set_state($_array,$_className);
+        return parent::__set_state($_array);
     }
     /**
      * Method returning the class name
diff --git a/lib/SessionManagement/Array/State/SessionManagementStructArrayOfSessionState.php b/lib/SessionManagement/Array/State/SessionManagementStructArrayOfSessionState.php
index 70debf5..3c39686 100644
--- a/lib/SessionManagement/Array/State/SessionManagementStructArrayOfSessionState.php
+++ b/lib/SessionManagement/Array/State/SessionManagementStructArrayOfSessionState.php
@@ -150,9 +150,9 @@ public function getAttributeName()
      * @param array $_array the exported values
      * @return SessionManagementStructArrayOfSessionState
      */
-    public static function __set_state(array $_array,$_className = __CLASS__)
+    public static function __set_state(array $_array)
     {
-        return parent::__set_state($_array,$_className);
+        return parent::__set_state($_array);
     }
     /**
      * Method returning the class name
diff --git a/lib/SessionManagement/Authentication/Info/SessionManagementStructAuthenticationInfo.php b/lib/SessionManagement/Authentication/Info/SessionManagementStructAuthenticationInfo.php
index c346637..13edc89 100644
--- a/lib/SessionManagement/Authentication/Info/SessionManagementStructAuthenticationInfo.php
+++ b/lib/SessionManagement/Authentication/Info/SessionManagementStructAuthenticationInfo.php
@@ -135,9 +135,9 @@ public function setUserKey($_userKey)
      * @param array $_array the exported values
      * @return SessionManagementStructAuthenticationInfo
      */
-    public static function __set_state(array $_array,$_className = __CLASS__)
+    public static function __set_state(array $_array)
     {
-        return parent::__set_state($_array,$_className);
+        return parent::__set_state($_array);
     }
     /**
      * Method returning the class name
diff --git a/lib/SessionManagement/Create/Response/SessionManagementStructCreateNoteByAbsoluteTimeResponse.php b/lib/SessionManagement/Create/Response/SessionManagementStructCreateNoteByAbsoluteTimeResponse.php
index 2337b55..2576ed3 100644
--- a/lib/SessionManagement/Create/Response/SessionManagementStructCreateNoteByAbsoluteTimeResponse.php
+++ b/lib/SessionManagement/Create/Response/SessionManagementStructCreateNoteByAbsoluteTimeResponse.php
@@ -83,9 +83,9 @@ public function setCreateNoteByAbsoluteTimeResult($_createNoteByAbsoluteTimeResu
      * @param array $_array the exported values
      * @return SessionManagementStructCreateNoteByAbsoluteTimeResponse
      */
-    public static function __set_state(array $_array,$_className = __CLASS__)
+    public static function __set_state(array $_array)
     {
-        return parent::__set_state($_array,$_className);
+        return parent::__set_state($_array);
     }
     /**
      * Method returning the class name
diff --git a/lib/SessionManagement/Create/Response/SessionManagementStructCreateNoteByRelativeTimeResponse.php b/lib/SessionManagement/Create/Response/SessionManagementStructCreateNoteByRelativeTimeResponse.php
index f56b54c..375eeb6 100644
--- a/lib/SessionManagement/Create/Response/SessionManagementStructCreateNoteByRelativeTimeResponse.php
+++ b/lib/SessionManagement/Create/Response/SessionManagementStructCreateNoteByRelativeTimeResponse.php
@@ -83,9 +83,9 @@ public function setCreateNoteByRelativeTimeResult($_createNoteByRelativeTimeResu
      * @param array $_array the exported values
      * @return SessionManagementStructCreateNoteByRelativeTimeResponse
      */
-    public static function __set_state(array $_array,$_className = __CLASS__)
+    public static function __set_state(array $_array)
     {
-        return parent::__set_state($_array,$_className);
+        return parent::__set_state($_array);
     }
     /**
      * Method returning the class name
diff --git a/lib/SessionManagement/Create/Time/SessionManagementStructCreateCaptionByAbsoluteTime.php b/lib/SessionManagement/Create/Time/SessionManagementStructCreateCaptionByAbsoluteTime.php
index b9825f2..6435ef8 100644
--- a/lib/SessionManagement/Create/Time/SessionManagementStructCreateCaptionByAbsoluteTime.php
+++ b/lib/SessionManagement/Create/Time/SessionManagementStructCreateCaptionByAbsoluteTime.php
@@ -160,9 +160,9 @@ public function setTimestamp($_timestamp)
      * @param array $_array the exported values
      * @return SessionManagementStructCreateCaptionByAbsoluteTime
      */
-    public static function __set_state(array $_array,$_className = __CLASS__)
+    public static function __set_state(array $_array)
     {
-        return parent::__set_state($_array,$_className);
+        return parent::__set_state($_array);
     }
     /**
      * Method returning the class name
diff --git a/lib/SessionManagement/Create/Time/SessionManagementStructCreateCaptionByRelativeTime.php b/lib/SessionManagement/Create/Time/SessionManagementStructCreateCaptionByRelativeTime.php
index e39b8dd..80ba304 100644
--- a/lib/SessionManagement/Create/Time/SessionManagementStructCreateCaptionByRelativeTime.php
+++ b/lib/SessionManagement/Create/Time/SessionManagementStructCreateCaptionByRelativeTime.php
@@ -160,9 +160,9 @@ public function setTimestamp($_timestamp)
      * @param array $_array the exported values
      * @return SessionManagementStructCreateCaptionByRelativeTime
      */
-    public static function __set_state(array $_array,$_className = __CLASS__)
+    public static function __set_state(array $_array)
     {
-        return parent::__set_state($_array,$_className);
+        return parent::__set_state($_array);
     }
     /**
      * Method returning the class name
diff --git a/lib/SessionManagement/Create/Time/SessionManagementStructCreateNoteByAbsoluteTime.php b/lib/SessionManagement/Create/Time/SessionManagementStructCreateNoteByAbsoluteTime.php
index 440759e..7ad578b 100644
--- a/lib/SessionManagement/Create/Time/SessionManagementStructCreateNoteByAbsoluteTime.php
+++ b/lib/SessionManagement/Create/Time/SessionManagementStructCreateNoteByAbsoluteTime.php
@@ -186,9 +186,9 @@ public function setTimestamp($_timestamp)
      * @param array $_array the exported values
      * @return SessionManagementStructCreateNoteByAbsoluteTime
      */
-    public static function __set_state(array $_array,$_className = __CLASS__)
+    public static function __set_state(array $_array)
     {
-        return parent::__set_state($_array,$_className);
+        return parent::__set_state($_array);
     }
     /**
      * Method returning the class name
diff --git a/lib/SessionManagement/Create/Time/SessionManagementStructCreateNoteByRelativeTime.php b/lib/SessionManagement/Create/Time/SessionManagementStructCreateNoteByRelativeTime.php
index 4be6b51..8cbf7fd 100644
--- a/lib/SessionManagement/Create/Time/SessionManagementStructCreateNoteByRelativeTime.php
+++ b/lib/SessionManagement/Create/Time/SessionManagementStructCreateNoteByRelativeTime.php
@@ -186,9 +186,9 @@ public function setTimestamp($_timestamp)
      * @param array $_array the exported values
      * @return SessionManagementStructCreateNoteByRelativeTime
      */
-    public static function __set_state(array $_array,$_className = __CLASS__)
+    public static function __set_state(array $_array)
     {
-        return parent::__set_state($_array,$_className);
+        return parent::__set_state($_array);
     }
     /**
      * Method returning the class name
diff --git a/lib/SessionManagement/Date/Offset/SessionManagementStructDateTimeOffset.php b/lib/SessionManagement/Date/Offset/SessionManagementStructDateTimeOffset.php
index 28a24fd..47aadb0 100644
--- a/lib/SessionManagement/Date/Offset/SessionManagementStructDateTimeOffset.php
+++ b/lib/SessionManagement/Date/Offset/SessionManagementStructDateTimeOffset.php
@@ -103,9 +103,9 @@ public function setOffsetMinutes($_offsetMinutes)
      * @param array $_array the exported values
      * @return SessionManagementStructDateTimeOffset
      */
-    public static function __set_state(array $_array,$_className = __CLASS__)
+    public static function __set_state(array $_array)
     {
-        return parent::__set_state($_array,$_className);
+        return parent::__set_state($_array);
     }
     /**
      * Method returning the class name
diff --git a/lib/SessionManagement/Delete/Folders/SessionManagementStructDeleteFolders.php b/lib/SessionManagement/Delete/Folders/SessionManagementStructDeleteFolders.php
index 1d65829..182b44b 100644
--- a/lib/SessionManagement/Delete/Folders/SessionManagementStructDeleteFolders.php
+++ b/lib/SessionManagement/Delete/Folders/SessionManagementStructDeleteFolders.php
@@ -109,9 +109,9 @@ public function setFolderIds($_folderIds)
      * @param array $_array the exported values
      * @return SessionManagementStructDeleteFolders
      */
-    public static function __set_state(array $_array,$_className = __CLASS__)
+    public static function __set_state(array $_array)
     {
-        return parent::__set_state($_array,$_className);
+        return parent::__set_state($_array);
     }
     /**
      * Method returning the class name
diff --git a/lib/SessionManagement/Delete/Note/SessionManagementStructDeleteNote.php b/lib/SessionManagement/Delete/Note/SessionManagementStructDeleteNote.php
index 579a776..9cf0dd2 100644
--- a/lib/SessionManagement/Delete/Note/SessionManagementStructDeleteNote.php
+++ b/lib/SessionManagement/Delete/Note/SessionManagementStructDeleteNote.php
@@ -135,9 +135,9 @@ public function setSessionId($_sessionId)
      * @param array $_array the exported values
      * @return SessionManagementStructDeleteNote
      */
-    public static function __set_state(array $_array,$_className = __CLASS__)
+    public static function __set_state(array $_array)
     {
-        return parent::__set_state($_array,$_className);
+        return parent::__set_state($_array);
     }
     /**
      * Method returning the class name
diff --git a/lib/SessionManagement/Delete/Sessions/SessionManagementStructDeleteSessions.php b/lib/SessionManagement/Delete/Sessions/SessionManagementStructDeleteSessions.php
index 4c931aa..b49ac11 100644
--- a/lib/SessionManagement/Delete/Sessions/SessionManagementStructDeleteSessions.php
+++ b/lib/SessionManagement/Delete/Sessions/SessionManagementStructDeleteSessions.php
@@ -109,9 +109,9 @@ public function setSessionIds($_sessionIds)
      * @param array $_array the exported values
      * @return SessionManagementStructDeleteSessions
      */
-    public static function __set_state(array $_array,$_className = __CLASS__)
+    public static function __set_state(array $_array)
     {
-        return parent::__set_state($_array,$_className);
+        return parent::__set_state($_array);
     }
     /**
      * Method returning the class name
diff --git a/lib/SessionManagement/Edit/Note/SessionManagementStructEditNote.php b/lib/SessionManagement/Edit/Note/SessionManagementStructEditNote.php
index 2f32d42..e0c16cc 100644
--- a/lib/SessionManagement/Edit/Note/SessionManagementStructEditNote.php
+++ b/lib/SessionManagement/Edit/Note/SessionManagementStructEditNote.php
@@ -161,9 +161,9 @@ public function setNewText($_newText)
      * @param array $_array the exported values
      * @return SessionManagementStructEditNote
      */
-    public static function __set_state(array $_array,$_className = __CLASS__)
+    public static function __set_state(array $_array)
     {
-        return parent::__set_state($_array,$_className);
+        return parent::__set_state($_array);
     }
     /**
      * Method returning the class name
diff --git a/lib/SessionManagement/Ensure/Branch/SessionManagementStructEnsureExternalHierarchyBranch.php b/lib/SessionManagement/Ensure/Branch/SessionManagementStructEnsureExternalHierarchyBranch.php
index 3947ead..6df20a2 100644
--- a/lib/SessionManagement/Ensure/Branch/SessionManagementStructEnsureExternalHierarchyBranch.php
+++ b/lib/SessionManagement/Ensure/Branch/SessionManagementStructEnsureExternalHierarchyBranch.php
@@ -107,9 +107,9 @@ public function setExternalHierarchyBranch($_externalHierarchyBranch)
      * @param array $_array the exported values
      * @return SessionManagementStructEnsureExternalHierarchyBranch
      */
-    public static function __set_state(array $_array,$_className = __CLASS__)
+    public static function __set_state(array $_array)
     {
-        return parent::__set_state($_array,$_className);
+        return parent::__set_state($_array);
     }
     /**
      * Method returning the class name
diff --git a/lib/SessionManagement/Ensure/Response/SessionManagementStructEnsureExternalHierarchyBranchResponse.php b/lib/SessionManagement/Ensure/Response/SessionManagementStructEnsureExternalHierarchyBranchResponse.php
index b9c483e..528abe3 100644
--- a/lib/SessionManagement/Ensure/Response/SessionManagementStructEnsureExternalHierarchyBranchResponse.php
+++ b/lib/SessionManagement/Ensure/Response/SessionManagementStructEnsureExternalHierarchyBranchResponse.php
@@ -81,9 +81,9 @@ public function setEnsureExternalHierarchyBranchResult($_EnsureExternalHierarchy
      * @param array $_array the exported values
      * @return SessionManagementStructEnsureExternalHierarchyBranchResponse
      */
-    public static function __set_state(array $_array,$_className = __CLASS__)
+    public static function __set_state(array $_array)
     {
-        return parent::__set_state($_array,$_className);
+        return parent::__set_state($_array);
     }
     /**
      * Method returning the class name
diff --git a/lib/SessionManagement/ExternalHierarchyInfo/SessionManagementStructExternalHierarchyInfo.php b/lib/SessionManagement/ExternalHierarchyInfo/SessionManagementStructExternalHierarchyInfo.php
index aeecb64..f6d8591 100644
--- a/lib/SessionManagement/ExternalHierarchyInfo/SessionManagementStructExternalHierarchyInfo.php
+++ b/lib/SessionManagement/ExternalHierarchyInfo/SessionManagementStructExternalHierarchyInfo.php
@@ -63,7 +63,7 @@ class SessionManagementStructExternalHierarchyInfo extends SessionManagementWsdl
      * @param string $_externalId
      * @param boolean $_isCourse
      */
-    public function __construct($_name = NULL,$_externalId = NULL,$_isCourse)
+    public function __construct($_isCourse,$_name = NULL,$_externalId = NULL)
     {
         parent::__construct(array('Name'=>$_name,'ExternalId'=>$_externalId,'IsCourse'=>$_isCourse),false);
     }
@@ -126,9 +126,9 @@ public function setIsCourse($_isCourse)
      * @param array $_array the exported values
      * @return SessionManagementStructExternalHierarchyInfo
      */
-    public static function __set_state(array $_array,$_className = __CLASS__)
+    public static function __set_state(array $_array)
     {
-        return parent::__set_state($_array,$_className);
+        return parent::__set_state($_array);
     }
     /**
      * Method returning the class name
diff --git a/lib/SessionManagement/Folder/Base/SessionManagementStructFolderBase.php b/lib/SessionManagement/Folder/Base/SessionManagementStructFolderBase.php
index 9a8bbc2..1cbf19b 100644
--- a/lib/SessionManagement/Folder/Base/SessionManagementStructFolderBase.php
+++ b/lib/SessionManagement/Folder/Base/SessionManagementStructFolderBase.php
@@ -573,9 +573,9 @@ public function setVideoRssUrl($_videoRssUrl)
      * @param array $_array the exported values
      * @return SessionManagementStructFolderBase
      */
-    public static function __set_state(array $_array,$_className = __CLASS__)
+    public static function __set_state(array $_array)
     {
-        return parent::__set_state($_array,$_className);
+        return parent::__set_state($_array);
     }
     /**
      * Method returning the class name
diff --git a/lib/SessionManagement/Folder/Context/SessionManagementStructFolderWithExternalContext.php b/lib/SessionManagement/Folder/Context/SessionManagementStructFolderWithExternalContext.php
index f82a669..f92c37b 100644
--- a/lib/SessionManagement/Folder/Context/SessionManagementStructFolderWithExternalContext.php
+++ b/lib/SessionManagement/Folder/Context/SessionManagementStructFolderWithExternalContext.php
@@ -83,9 +83,9 @@ public function setExternalIds($_externalIds)
      * @param array $_array the exported values
      * @return SessionManagementStructFolderWithExternalContext
      */
-    public static function __set_state(array $_array,$_className = __CLASS__)
+    public static function __set_state(array $_array)
     {
-        return parent::__set_state($_array,$_className);
+        return parent::__set_state($_array);
     }
     /**
      * Method returning the class name
diff --git a/lib/SessionManagement/Folder/SessionManagementStructFolder.php b/lib/SessionManagement/Folder/SessionManagementStructFolder.php
index ca676b9..9f36ef5 100644
--- a/lib/SessionManagement/Folder/SessionManagementStructFolder.php
+++ b/lib/SessionManagement/Folder/SessionManagementStructFolder.php
@@ -83,9 +83,9 @@ public function setExternalId($_externalId)
      * @param array $_array the exported values
      * @return SessionManagementStructFolder
      */
-    public static function __set_state(array $_array,$_className = __CLASS__)
+    public static function __set_state(array $_array)
     {
-        return parent::__set_state($_array,$_className);
+        return parent::__set_state($_array);
     }
     /**
      * Method returning the class name
diff --git a/lib/SessionManagement/Folder/Settings/SessionManagementStructFolderAvailabilitySettings.php b/lib/SessionManagement/Folder/Settings/SessionManagementStructFolderAvailabilitySettings.php
index 4c985ae..b151711 100644
--- a/lib/SessionManagement/Folder/Settings/SessionManagementStructFolderAvailabilitySettings.php
+++ b/lib/SessionManagement/Folder/Settings/SessionManagementStructFolderAvailabilitySettings.php
@@ -195,9 +195,9 @@ public function setStartSettingType($_startSettingType)
      * @param array $_array the exported values
      * @return SessionManagementStructFolderAvailabilitySettings
      */
-    public static function __set_state(array $_array,$_className = __CLASS__)
+    public static function __set_state(array $_array)
     {
-        return parent::__set_state($_array,$_className);
+        return parent::__set_state($_array);
     }
     /**
      * Method returning the class name
diff --git a/lib/SessionManagement/Folders/Settings/SessionManagementStructFoldersWithAvailabilitySettings.php b/lib/SessionManagement/Folders/Settings/SessionManagementStructFoldersWithAvailabilitySettings.php
index fda1dc8..36a70f2 100644
--- a/lib/SessionManagement/Folders/Settings/SessionManagementStructFoldersWithAvailabilitySettings.php
+++ b/lib/SessionManagement/Folders/Settings/SessionManagementStructFoldersWithAvailabilitySettings.php
@@ -108,9 +108,9 @@ public function setTotalNumberResults($_totalNumberResults)
      * @param array $_array the exported values
      * @return SessionManagementStructFoldersWithAvailabilitySettings
      */
-    public static function __set_state(array $_array,$_className = __CLASS__)
+    public static function __set_state(array $_array)
     {
-        return parent::__set_state($_array,$_className);
+        return parent::__set_state($_array);
     }
     /**
      * Method returning the class name
diff --git a/lib/SessionManagement/Get/Id/SessionManagementStructGetAllFoldersByExternalId.php b/lib/SessionManagement/Get/Id/SessionManagementStructGetAllFoldersByExternalId.php
index 567bb22..4caacd8 100644
--- a/lib/SessionManagement/Get/Id/SessionManagementStructGetAllFoldersByExternalId.php
+++ b/lib/SessionManagement/Get/Id/SessionManagementStructGetAllFoldersByExternalId.php
@@ -135,9 +135,9 @@ public function setProviderNames($_providerNames)
      * @param array $_array the exported values
      * @return SessionManagementStructGetAllFoldersByExternalId
      */
-    public static function __set_state(array $_array,$_className = __CLASS__)
+    public static function __set_state(array $_array)
     {
-        return parent::__set_state($_array,$_className);
+        return parent::__set_state($_array);
     }
     /**
      * Method returning the class name
diff --git a/lib/SessionManagement/Get/Id/SessionManagementStructGetAllFoldersWithExternalContextByExternalId.php b/lib/SessionManagement/Get/Id/SessionManagementStructGetAllFoldersWithExternalContextByExternalId.php
index c13257b..55f7358 100644
--- a/lib/SessionManagement/Get/Id/SessionManagementStructGetAllFoldersWithExternalContextByExternalId.php
+++ b/lib/SessionManagement/Get/Id/SessionManagementStructGetAllFoldersWithExternalContextByExternalId.php
@@ -135,9 +135,9 @@ public function setProviderNames($_providerNames)
      * @param array $_array the exported values
      * @return SessionManagementStructGetAllFoldersWithExternalContextByExternalId
      */
-    public static function __set_state(array $_array,$_className = __CLASS__)
+    public static function __set_state(array $_array)
     {
-        return parent::__set_state($_array,$_className);
+        return parent::__set_state($_array);
     }
     /**
      * Method returning the class name
diff --git a/lib/SessionManagement/Get/Id/SessionManagementStructGetFoldersByExternalId.php b/lib/SessionManagement/Get/Id/SessionManagementStructGetFoldersByExternalId.php
index 20a3846..c7a311e 100644
--- a/lib/SessionManagement/Get/Id/SessionManagementStructGetFoldersByExternalId.php
+++ b/lib/SessionManagement/Get/Id/SessionManagementStructGetFoldersByExternalId.php
@@ -109,9 +109,9 @@ public function setFolderExternalIds($_folderExternalIds)
      * @param array $_array the exported values
      * @return SessionManagementStructGetFoldersByExternalId
      */
-    public static function __set_state(array $_array,$_className = __CLASS__)
+    public static function __set_state(array $_array)
     {
-        return parent::__set_state($_array,$_className);
+        return parent::__set_state($_array);
     }
     /**
      * Method returning the class name
diff --git a/lib/SessionManagement/Get/Id/SessionManagementStructGetFoldersById.php b/lib/SessionManagement/Get/Id/SessionManagementStructGetFoldersById.php
index 2632d57..02df4aa 100644
--- a/lib/SessionManagement/Get/Id/SessionManagementStructGetFoldersById.php
+++ b/lib/SessionManagement/Get/Id/SessionManagementStructGetFoldersById.php
@@ -109,9 +109,9 @@ public function setFolderIds($_folderIds)
      * @param array $_array the exported values
      * @return SessionManagementStructGetFoldersById
      */
-    public static function __set_state(array $_array,$_className = __CLASS__)
+    public static function __set_state(array $_array)
     {
-        return parent::__set_state($_array,$_className);
+        return parent::__set_state($_array);
     }
     /**
      * Method returning the class name
diff --git a/lib/SessionManagement/Get/Id/SessionManagementStructGetFoldersWithExternalContextByExternalId.php b/lib/SessionManagement/Get/Id/SessionManagementStructGetFoldersWithExternalContextByExternalId.php
index a584864..dd0d609 100644
--- a/lib/SessionManagement/Get/Id/SessionManagementStructGetFoldersWithExternalContextByExternalId.php
+++ b/lib/SessionManagement/Get/Id/SessionManagementStructGetFoldersWithExternalContextByExternalId.php
@@ -109,9 +109,9 @@ public function setFolderExternalIds($_folderExternalIds)
      * @param array $_array the exported values
      * @return SessionManagementStructGetFoldersWithExternalContextByExternalId
      */
-    public static function __set_state(array $_array,$_className = __CLASS__)
+    public static function __set_state(array $_array)
     {
-        return parent::__set_state($_array,$_className);
+        return parent::__set_state($_array);
     }
     /**
      * Method returning the class name
diff --git a/lib/SessionManagement/Get/Id/SessionManagementStructGetFoldersWithExternalContextById.php b/lib/SessionManagement/Get/Id/SessionManagementStructGetFoldersWithExternalContextById.php
index 5528594..d617e61 100644
--- a/lib/SessionManagement/Get/Id/SessionManagementStructGetFoldersWithExternalContextById.php
+++ b/lib/SessionManagement/Get/Id/SessionManagementStructGetFoldersWithExternalContextById.php
@@ -109,9 +109,9 @@ public function setFolderIds($_folderIds)
      * @param array $_array the exported values
      * @return SessionManagementStructGetFoldersWithExternalContextById
      */
-    public static function __set_state(array $_array,$_className = __CLASS__)
+    public static function __set_state(array $_array)
     {
-        return parent::__set_state($_array,$_className);
+        return parent::__set_state($_array);
     }
     /**
      * Method returning the class name
diff --git a/lib/SessionManagement/Get/Id/SessionManagementStructGetSessionsByExternalId.php b/lib/SessionManagement/Get/Id/SessionManagementStructGetSessionsByExternalId.php
index ee6d72d..5ad1951 100644
--- a/lib/SessionManagement/Get/Id/SessionManagementStructGetSessionsByExternalId.php
+++ b/lib/SessionManagement/Get/Id/SessionManagementStructGetSessionsByExternalId.php
@@ -109,9 +109,9 @@ public function setSessionExternalIds($_sessionExternalIds)
      * @param array $_array the exported values
      * @return SessionManagementStructGetSessionsByExternalId
      */
-    public static function __set_state(array $_array,$_className = __CLASS__)
+    public static function __set_state(array $_array)
     {
-        return parent::__set_state($_array,$_className);
+        return parent::__set_state($_array);
     }
     /**
      * Method returning the class name
diff --git a/lib/SessionManagement/Get/Id/SessionManagementStructGetSessionsById.php b/lib/SessionManagement/Get/Id/SessionManagementStructGetSessionsById.php
index 1b48220..61e47a6 100644
--- a/lib/SessionManagement/Get/Id/SessionManagementStructGetSessionsById.php
+++ b/lib/SessionManagement/Get/Id/SessionManagementStructGetSessionsById.php
@@ -109,9 +109,9 @@ public function setSessionIds($_sessionIds)
      * @param array $_array the exported values
      * @return SessionManagementStructGetSessionsById
      */
-    public static function __set_state(array $_array,$_className = __CLASS__)
+    public static function __set_state(array $_array)
     {
-        return parent::__set_state($_array,$_className);
+        return parent::__set_state($_array);
     }
     /**
      * Method returning the class name
diff --git a/lib/SessionManagement/Get/List/SessionManagementStructGetCreatorFoldersList.php b/lib/SessionManagement/Get/List/SessionManagementStructGetCreatorFoldersList.php
index a076879..74ff3a1 100644
--- a/lib/SessionManagement/Get/List/SessionManagementStructGetCreatorFoldersList.php
+++ b/lib/SessionManagement/Get/List/SessionManagementStructGetCreatorFoldersList.php
@@ -135,9 +135,9 @@ public function setSearchQuery($_searchQuery)
      * @param array $_array the exported values
      * @return SessionManagementStructGetCreatorFoldersList
      */
-    public static function __set_state(array $_array,$_className = __CLASS__)
+    public static function __set_state(array $_array)
     {
-        return parent::__set_state($_array,$_className);
+        return parent::__set_state($_array);
     }
     /**
      * Method returning the class name
diff --git a/lib/SessionManagement/Get/List/SessionManagementStructGetCreatorFoldersWithExternalContextList.php b/lib/SessionManagement/Get/List/SessionManagementStructGetCreatorFoldersWithExternalContextList.php
index 257550f..d9a4e9d 100644
--- a/lib/SessionManagement/Get/List/SessionManagementStructGetCreatorFoldersWithExternalContextList.php
+++ b/lib/SessionManagement/Get/List/SessionManagementStructGetCreatorFoldersWithExternalContextList.php
@@ -135,9 +135,9 @@ public function setSearchQuery($_searchQuery)
      * @param array $_array the exported values
      * @return SessionManagementStructGetCreatorFoldersWithExternalContextList
      */
-    public static function __set_state(array $_array,$_className = __CLASS__)
+    public static function __set_state(array $_array)
     {
-        return parent::__set_state($_array,$_className);
+        return parent::__set_state($_array);
     }
     /**
      * Method returning the class name
diff --git a/lib/SessionManagement/Get/List/SessionManagementStructGetFoldersList.php b/lib/SessionManagement/Get/List/SessionManagementStructGetFoldersList.php
index 279f71c..fb8d573 100644
--- a/lib/SessionManagement/Get/List/SessionManagementStructGetFoldersList.php
+++ b/lib/SessionManagement/Get/List/SessionManagementStructGetFoldersList.php
@@ -135,9 +135,9 @@ public function setSearchQuery($_searchQuery)
      * @param array $_array the exported values
      * @return SessionManagementStructGetFoldersList
      */
-    public static function __set_state(array $_array,$_className = __CLASS__)
+    public static function __set_state(array $_array)
     {
-        return parent::__set_state($_array,$_className);
+        return parent::__set_state($_array);
     }
     /**
      * Method returning the class name
diff --git a/lib/SessionManagement/Get/List/SessionManagementStructGetFoldersWithExternalContextList.php b/lib/SessionManagement/Get/List/SessionManagementStructGetFoldersWithExternalContextList.php
index ec598f6..cd29635 100644
--- a/lib/SessionManagement/Get/List/SessionManagementStructGetFoldersWithExternalContextList.php
+++ b/lib/SessionManagement/Get/List/SessionManagementStructGetFoldersWithExternalContextList.php
@@ -135,9 +135,9 @@ public function setSearchQuery($_searchQuery)
      * @param array $_array the exported values
      * @return SessionManagementStructGetFoldersWithExternalContextList
      */
-    public static function __set_state(array $_array,$_className = __CLASS__)
+    public static function __set_state(array $_array)
     {
-        return parent::__set_state($_array,$_className);
+        return parent::__set_state($_array);
     }
     /**
      * Method returning the class name
diff --git a/lib/SessionManagement/Get/List/SessionManagementStructGetSessionsList.php b/lib/SessionManagement/Get/List/SessionManagementStructGetSessionsList.php
index 9163e50..7200c26 100644
--- a/lib/SessionManagement/Get/List/SessionManagementStructGetSessionsList.php
+++ b/lib/SessionManagement/Get/List/SessionManagementStructGetSessionsList.php
@@ -135,9 +135,9 @@ public function setSearchQuery($_searchQuery)
      * @param array $_array the exported values
      * @return SessionManagementStructGetSessionsList
      */
-    public static function __set_state(array $_array,$_className = __CLASS__)
+    public static function __set_state(array $_array)
     {
-        return parent::__set_state($_array,$_className);
+        return parent::__set_state($_array);
     }
     /**
      * Method returning the class name
diff --git a/lib/SessionManagement/Get/Note/SessionManagementStructGetNote.php b/lib/SessionManagement/Get/Note/SessionManagementStructGetNote.php
index fe8cc33..8e950ef 100644
--- a/lib/SessionManagement/Get/Note/SessionManagementStructGetNote.php
+++ b/lib/SessionManagement/Get/Note/SessionManagementStructGetNote.php
@@ -135,9 +135,9 @@ public function setSessionId($_sessionId)
      * @param array $_array the exported values
      * @return SessionManagementStructGetNote
      */
-    public static function __set_state(array $_array,$_className = __CLASS__)
+    public static function __set_state(array $_array)
     {
-        return parent::__set_state($_array,$_className);
+        return parent::__set_state($_array);
     }
     /**
      * Method returning the class name
diff --git a/lib/SessionManagement/Get/Response/SessionManagementStructGetAllFoldersByExternalIdResponse.php b/lib/SessionManagement/Get/Response/SessionManagementStructGetAllFoldersByExternalIdResponse.php
index b453917..733f1f7 100644
--- a/lib/SessionManagement/Get/Response/SessionManagementStructGetAllFoldersByExternalIdResponse.php
+++ b/lib/SessionManagement/Get/Response/SessionManagementStructGetAllFoldersByExternalIdResponse.php
@@ -83,9 +83,9 @@ public function setGetAllFoldersByExternalIdResult($_getAllFoldersByExternalIdRe
      * @param array $_array the exported values
      * @return SessionManagementStructGetAllFoldersByExternalIdResponse
      */
-    public static function __set_state(array $_array,$_className = __CLASS__)
+    public static function __set_state(array $_array)
     {
-        return parent::__set_state($_array,$_className);
+        return parent::__set_state($_array);
     }
     /**
      * Method returning the class name
diff --git a/lib/SessionManagement/Get/Response/SessionManagementStructGetAllFoldersWithExternalContextByExternalIdResponse.php b/lib/SessionManagement/Get/Response/SessionManagementStructGetAllFoldersWithExternalContextByExternalIdResponse.php
index a6f6139..102dacb 100644
--- a/lib/SessionManagement/Get/Response/SessionManagementStructGetAllFoldersWithExternalContextByExternalIdResponse.php
+++ b/lib/SessionManagement/Get/Response/SessionManagementStructGetAllFoldersWithExternalContextByExternalIdResponse.php
@@ -83,9 +83,9 @@ public function setGetAllFoldersWithExternalContextByExternalIdResult($_getAllFo
      * @param array $_array the exported values
      * @return SessionManagementStructGetAllFoldersWithExternalContextByExternalIdResponse
      */
-    public static function __set_state(array $_array,$_className = __CLASS__)
+    public static function __set_state(array $_array)
     {
-        return parent::__set_state($_array,$_className);
+        return parent::__set_state($_array);
     }
     /**
      * Method returning the class name
diff --git a/lib/SessionManagement/Get/Response/SessionManagementStructGetCreatorFoldersListResponse.php b/lib/SessionManagement/Get/Response/SessionManagementStructGetCreatorFoldersListResponse.php
index 33b8bd2..24b12fc 100644
--- a/lib/SessionManagement/Get/Response/SessionManagementStructGetCreatorFoldersListResponse.php
+++ b/lib/SessionManagement/Get/Response/SessionManagementStructGetCreatorFoldersListResponse.php
@@ -83,9 +83,9 @@ public function setGetCreatorFoldersListResult($_getCreatorFoldersListResult)
      * @param array $_array the exported values
      * @return SessionManagementStructGetCreatorFoldersListResponse
      */
-    public static function __set_state(array $_array,$_className = __CLASS__)
+    public static function __set_state(array $_array)
     {
-        return parent::__set_state($_array,$_className);
+        return parent::__set_state($_array);
     }
     /**
      * Method returning the class name
diff --git a/lib/SessionManagement/Get/Response/SessionManagementStructGetCreatorFoldersWithExternalContextListResponse.php b/lib/SessionManagement/Get/Response/SessionManagementStructGetCreatorFoldersWithExternalContextListResponse.php
index 8b3fd47..67c992a 100644
--- a/lib/SessionManagement/Get/Response/SessionManagementStructGetCreatorFoldersWithExternalContextListResponse.php
+++ b/lib/SessionManagement/Get/Response/SessionManagementStructGetCreatorFoldersWithExternalContextListResponse.php
@@ -83,9 +83,9 @@ public function setGetCreatorFoldersWithExternalContextListResult($_getCreatorFo
      * @param array $_array the exported values
      * @return SessionManagementStructGetCreatorFoldersWithExternalContextListResponse
      */
-    public static function __set_state(array $_array,$_className = __CLASS__)
+    public static function __set_state(array $_array)
     {
-        return parent::__set_state($_array,$_className);
+        return parent::__set_state($_array);
     }
     /**
      * Method returning the class name
diff --git a/lib/SessionManagement/Get/Response/SessionManagementStructGetFoldersAvailabilitySettingsResponse.php b/lib/SessionManagement/Get/Response/SessionManagementStructGetFoldersAvailabilitySettingsResponse.php
index 84b52e2..e26e982 100644
--- a/lib/SessionManagement/Get/Response/SessionManagementStructGetFoldersAvailabilitySettingsResponse.php
+++ b/lib/SessionManagement/Get/Response/SessionManagementStructGetFoldersAvailabilitySettingsResponse.php
@@ -83,9 +83,9 @@ public function setGetFoldersAvailabilitySettingsResult($_getFoldersAvailability
      * @param array $_array the exported values
      * @return SessionManagementStructGetFoldersAvailabilitySettingsResponse
      */
-    public static function __set_state(array $_array,$_className = __CLASS__)
+    public static function __set_state(array $_array)
     {
-        return parent::__set_state($_array,$_className);
+        return parent::__set_state($_array);
     }
     /**
      * Method returning the class name
diff --git a/lib/SessionManagement/Get/Response/SessionManagementStructGetFoldersByExternalIdResponse.php b/lib/SessionManagement/Get/Response/SessionManagementStructGetFoldersByExternalIdResponse.php
index d085cb5..080b929 100644
--- a/lib/SessionManagement/Get/Response/SessionManagementStructGetFoldersByExternalIdResponse.php
+++ b/lib/SessionManagement/Get/Response/SessionManagementStructGetFoldersByExternalIdResponse.php
@@ -83,9 +83,9 @@ public function setGetFoldersByExternalIdResult($_getFoldersByExternalIdResult)
      * @param array $_array the exported values
      * @return SessionManagementStructGetFoldersByExternalIdResponse
      */
-    public static function __set_state(array $_array,$_className = __CLASS__)
+    public static function __set_state(array $_array)
     {
-        return parent::__set_state($_array,$_className);
+        return parent::__set_state($_array);
     }
     /**
      * Method returning the class name
diff --git a/lib/SessionManagement/Get/Response/SessionManagementStructGetFoldersByIdResponse.php b/lib/SessionManagement/Get/Response/SessionManagementStructGetFoldersByIdResponse.php
index 13d7845..467335e 100644
--- a/lib/SessionManagement/Get/Response/SessionManagementStructGetFoldersByIdResponse.php
+++ b/lib/SessionManagement/Get/Response/SessionManagementStructGetFoldersByIdResponse.php
@@ -83,9 +83,9 @@ public function setGetFoldersByIdResult($_getFoldersByIdResult)
      * @param array $_array the exported values
      * @return SessionManagementStructGetFoldersByIdResponse
      */
-    public static function __set_state(array $_array,$_className = __CLASS__)
+    public static function __set_state(array $_array)
     {
-        return parent::__set_state($_array,$_className);
+        return parent::__set_state($_array);
     }
     /**
      * Method returning the class name
diff --git a/lib/SessionManagement/Get/Response/SessionManagementStructGetFoldersListResponse.php b/lib/SessionManagement/Get/Response/SessionManagementStructGetFoldersListResponse.php
index 5525ab5..9deaa4f 100644
--- a/lib/SessionManagement/Get/Response/SessionManagementStructGetFoldersListResponse.php
+++ b/lib/SessionManagement/Get/Response/SessionManagementStructGetFoldersListResponse.php
@@ -83,9 +83,9 @@ public function setGetFoldersListResult($_getFoldersListResult)
      * @param array $_array the exported values
      * @return SessionManagementStructGetFoldersListResponse
      */
-    public static function __set_state(array $_array,$_className = __CLASS__)
+    public static function __set_state(array $_array)
     {
-        return parent::__set_state($_array,$_className);
+        return parent::__set_state($_array);
     }
     /**
      * Method returning the class name
diff --git a/lib/SessionManagement/Get/Response/SessionManagementStructGetFoldersWithExternalContextByExternalIdResponse.php b/lib/SessionManagement/Get/Response/SessionManagementStructGetFoldersWithExternalContextByExternalIdResponse.php
index ea33aef..74f54d8 100644
--- a/lib/SessionManagement/Get/Response/SessionManagementStructGetFoldersWithExternalContextByExternalIdResponse.php
+++ b/lib/SessionManagement/Get/Response/SessionManagementStructGetFoldersWithExternalContextByExternalIdResponse.php
@@ -83,9 +83,9 @@ public function setGetFoldersWithExternalContextByExternalIdResult($_getFoldersW
      * @param array $_array the exported values
      * @return SessionManagementStructGetFoldersWithExternalContextByExternalIdResponse
      */
-    public static function __set_state(array $_array,$_className = __CLASS__)
+    public static function __set_state(array $_array)
     {
-        return parent::__set_state($_array,$_className);
+        return parent::__set_state($_array);
     }
     /**
      * Method returning the class name
diff --git a/lib/SessionManagement/Get/Response/SessionManagementStructGetFoldersWithExternalContextByIdResponse.php b/lib/SessionManagement/Get/Response/SessionManagementStructGetFoldersWithExternalContextByIdResponse.php
index f89da0a..1ed55f5 100644
--- a/lib/SessionManagement/Get/Response/SessionManagementStructGetFoldersWithExternalContextByIdResponse.php
+++ b/lib/SessionManagement/Get/Response/SessionManagementStructGetFoldersWithExternalContextByIdResponse.php
@@ -83,9 +83,9 @@ public function setGetFoldersWithExternalContextByIdResult($_getFoldersWithExter
      * @param array $_array the exported values
      * @return SessionManagementStructGetFoldersWithExternalContextByIdResponse
      */
-    public static function __set_state(array $_array,$_className = __CLASS__)
+    public static function __set_state(array $_array)
     {
-        return parent::__set_state($_array,$_className);
+        return parent::__set_state($_array);
     }
     /**
      * Method returning the class name
diff --git a/lib/SessionManagement/Get/Response/SessionManagementStructGetFoldersWithExternalContextListResponse.php b/lib/SessionManagement/Get/Response/SessionManagementStructGetFoldersWithExternalContextListResponse.php
index 309ae24..0b3cefc 100644
--- a/lib/SessionManagement/Get/Response/SessionManagementStructGetFoldersWithExternalContextListResponse.php
+++ b/lib/SessionManagement/Get/Response/SessionManagementStructGetFoldersWithExternalContextListResponse.php
@@ -83,9 +83,9 @@ public function setGetFoldersWithExternalContextListResult($_getFoldersWithExter
      * @param array $_array the exported values
      * @return SessionManagementStructGetFoldersWithExternalContextListResponse
      */
-    public static function __set_state(array $_array,$_className = __CLASS__)
+    public static function __set_state(array $_array)
     {
-        return parent::__set_state($_array,$_className);
+        return parent::__set_state($_array);
     }
     /**
      * Method returning the class name
diff --git a/lib/SessionManagement/Get/Response/SessionManagementStructGetNoteResponse.php b/lib/SessionManagement/Get/Response/SessionManagementStructGetNoteResponse.php
index 121a04f..c291277 100644
--- a/lib/SessionManagement/Get/Response/SessionManagementStructGetNoteResponse.php
+++ b/lib/SessionManagement/Get/Response/SessionManagementStructGetNoteResponse.php
@@ -83,9 +83,9 @@ public function setGetNoteResult($_getNoteResult)
      * @param array $_array the exported values
      * @return SessionManagementStructGetNoteResponse
      */
-    public static function __set_state(array $_array,$_className = __CLASS__)
+    public static function __set_state(array $_array)
     {
-        return parent::__set_state($_array,$_className);
+        return parent::__set_state($_array);
     }
     /**
      * Method returning the class name
diff --git a/lib/SessionManagement/Get/Response/SessionManagementStructGetPersonalFolderForUserResponse.php b/lib/SessionManagement/Get/Response/SessionManagementStructGetPersonalFolderForUserResponse.php
index 69920a3..cfd6239 100644
--- a/lib/SessionManagement/Get/Response/SessionManagementStructGetPersonalFolderForUserResponse.php
+++ b/lib/SessionManagement/Get/Response/SessionManagementStructGetPersonalFolderForUserResponse.php
@@ -83,9 +83,9 @@ public function setGetPersonalFolderForUserResult($_getPersonalFolderForUserResu
      * @param array $_array the exported values
      * @return SessionManagementStructGetPersonalFolderForUserResponse
      */
-    public static function __set_state(array $_array,$_className = __CLASS__)
+    public static function __set_state(array $_array)
     {
-        return parent::__set_state($_array,$_className);
+        return parent::__set_state($_array);
     }
     /**
      * Method returning the class name
diff --git a/lib/SessionManagement/Get/Response/SessionManagementStructGetRecorderDownloadUrlsResponse.php b/lib/SessionManagement/Get/Response/SessionManagementStructGetRecorderDownloadUrlsResponse.php
index 2319e8f..1dec7c9 100644
--- a/lib/SessionManagement/Get/Response/SessionManagementStructGetRecorderDownloadUrlsResponse.php
+++ b/lib/SessionManagement/Get/Response/SessionManagementStructGetRecorderDownloadUrlsResponse.php
@@ -83,9 +83,9 @@ public function setGetRecorderDownloadUrlsResult($_getRecorderDownloadUrlsResult
      * @param array $_array the exported values
      * @return SessionManagementStructGetRecorderDownloadUrlsResponse
      */
-    public static function __set_state(array $_array,$_className = __CLASS__)
+    public static function __set_state(array $_array)
     {
-        return parent::__set_state($_array,$_className);
+        return parent::__set_state($_array);
     }
     /**
      * Method returning the class name
diff --git a/lib/SessionManagement/Get/Response/SessionManagementStructGetSessionsAvailabilitySettingsResponse.php b/lib/SessionManagement/Get/Response/SessionManagementStructGetSessionsAvailabilitySettingsResponse.php
index 37da92e..440228b 100644
--- a/lib/SessionManagement/Get/Response/SessionManagementStructGetSessionsAvailabilitySettingsResponse.php
+++ b/lib/SessionManagement/Get/Response/SessionManagementStructGetSessionsAvailabilitySettingsResponse.php
@@ -83,9 +83,9 @@ public function setGetSessionsAvailabilitySettingsResult($_getSessionsAvailabili
      * @param array $_array the exported values
      * @return SessionManagementStructGetSessionsAvailabilitySettingsResponse
      */
-    public static function __set_state(array $_array,$_className = __CLASS__)
+    public static function __set_state(array $_array)
     {
-        return parent::__set_state($_array,$_className);
+        return parent::__set_state($_array);
     }
     /**
      * Method returning the class name
diff --git a/lib/SessionManagement/Get/Response/SessionManagementStructGetSessionsByExternalIdResponse.php b/lib/SessionManagement/Get/Response/SessionManagementStructGetSessionsByExternalIdResponse.php
index 7358ea5..dc536ea 100644
--- a/lib/SessionManagement/Get/Response/SessionManagementStructGetSessionsByExternalIdResponse.php
+++ b/lib/SessionManagement/Get/Response/SessionManagementStructGetSessionsByExternalIdResponse.php
@@ -83,9 +83,9 @@ public function setGetSessionsByExternalIdResult($_getSessionsByExternalIdResult
      * @param array $_array the exported values
      * @return SessionManagementStructGetSessionsByExternalIdResponse
      */
-    public static function __set_state(array $_array,$_className = __CLASS__)
+    public static function __set_state(array $_array)
     {
-        return parent::__set_state($_array,$_className);
+        return parent::__set_state($_array);
     }
     /**
      * Method returning the class name
diff --git a/lib/SessionManagement/Get/Response/SessionManagementStructGetSessionsByIdResponse.php b/lib/SessionManagement/Get/Response/SessionManagementStructGetSessionsByIdResponse.php
index 200a13a..7eeede3 100644
--- a/lib/SessionManagement/Get/Response/SessionManagementStructGetSessionsByIdResponse.php
+++ b/lib/SessionManagement/Get/Response/SessionManagementStructGetSessionsByIdResponse.php
@@ -83,9 +83,9 @@ public function setGetSessionsByIdResult($_getSessionsByIdResult)
      * @param array $_array the exported values
      * @return SessionManagementStructGetSessionsByIdResponse
      */
-    public static function __set_state(array $_array,$_className = __CLASS__)
+    public static function __set_state(array $_array)
     {
-        return parent::__set_state($_array,$_className);
+        return parent::__set_state($_array);
     }
     /**
      * Method returning the class name
diff --git a/lib/SessionManagement/Get/Response/SessionManagementStructGetSessionsListResponse.php b/lib/SessionManagement/Get/Response/SessionManagementStructGetSessionsListResponse.php
index ea593e7..9e7f2c2 100644
--- a/lib/SessionManagement/Get/Response/SessionManagementStructGetSessionsListResponse.php
+++ b/lib/SessionManagement/Get/Response/SessionManagementStructGetSessionsListResponse.php
@@ -83,9 +83,9 @@ public function setGetSessionsListResult($_getSessionsListResult)
      * @param array $_array the exported values
      * @return SessionManagementStructGetSessionsListResponse
      */
-    public static function __set_state(array $_array,$_className = __CLASS__)
+    public static function __set_state(array $_array)
     {
-        return parent::__set_state($_array,$_className);
+        return parent::__set_state($_array);
     }
     /**
      * Method returning the class name
diff --git a/lib/SessionManagement/Get/Settings/SessionManagementStructGetFoldersAvailabilitySettings.php b/lib/SessionManagement/Get/Settings/SessionManagementStructGetFoldersAvailabilitySettings.php
index 768bd98..398befe 100644
--- a/lib/SessionManagement/Get/Settings/SessionManagementStructGetFoldersAvailabilitySettings.php
+++ b/lib/SessionManagement/Get/Settings/SessionManagementStructGetFoldersAvailabilitySettings.php
@@ -109,9 +109,9 @@ public function setFolderIds($_folderIds)
      * @param array $_array the exported values
      * @return SessionManagementStructGetFoldersAvailabilitySettings
      */
-    public static function __set_state(array $_array,$_className = __CLASS__)
+    public static function __set_state(array $_array)
     {
-        return parent::__set_state($_array,$_className);
+        return parent::__set_state($_array);
     }
     /**
      * Method returning the class name
diff --git a/lib/SessionManagement/Get/Settings/SessionManagementStructGetSessionsAvailabilitySettings.php b/lib/SessionManagement/Get/Settings/SessionManagementStructGetSessionsAvailabilitySettings.php
index a7d8840..7930804 100644
--- a/lib/SessionManagement/Get/Settings/SessionManagementStructGetSessionsAvailabilitySettings.php
+++ b/lib/SessionManagement/Get/Settings/SessionManagementStructGetSessionsAvailabilitySettings.php
@@ -109,9 +109,9 @@ public function setSessionIds($_sessionIds)
      * @param array $_array the exported values
      * @return SessionManagementStructGetSessionsAvailabilitySettings
      */
-    public static function __set_state(array $_array,$_className = __CLASS__)
+    public static function __set_state(array $_array)
     {
-        return parent::__set_state($_array,$_className);
+        return parent::__set_state($_array);
     }
     /**
      * Method returning the class name
diff --git a/lib/SessionManagement/Get/User/SessionManagementStructGetPersonalFolderForUser.php b/lib/SessionManagement/Get/User/SessionManagementStructGetPersonalFolderForUser.php
index e248836..ba2956b 100644
--- a/lib/SessionManagement/Get/User/SessionManagementStructGetPersonalFolderForUser.php
+++ b/lib/SessionManagement/Get/User/SessionManagementStructGetPersonalFolderForUser.php
@@ -134,9 +134,9 @@ public function setAllowCreation($_allowCreation)
      * @param array $_array the exported values
      * @return SessionManagementStructGetPersonalFolderForUser
      */
-    public static function __set_state(array $_array,$_className = __CLASS__)
+    public static function __set_state(array $_array)
     {
-        return parent::__set_state($_array,$_className);
+        return parent::__set_state($_array);
     }
     /**
      * Method returning the class name
diff --git a/lib/SessionManagement/Is/Dropbox/SessionManagementStructIsDropbox.php b/lib/SessionManagement/Is/Dropbox/SessionManagementStructIsDropbox.php
index 18e6da8..46f8712 100644
--- a/lib/SessionManagement/Is/Dropbox/SessionManagementStructIsDropbox.php
+++ b/lib/SessionManagement/Is/Dropbox/SessionManagementStructIsDropbox.php
@@ -109,9 +109,9 @@ public function setFolderId($_folderId)
      * @param array $_array the exported values
      * @return SessionManagementStructIsDropbox
      */
-    public static function __set_state(array $_array,$_className = __CLASS__)
+    public static function __set_state(array $_array)
     {
-        return parent::__set_state($_array,$_className);
+        return parent::__set_state($_array);
     }
     /**
      * Method returning the class name
diff --git a/lib/SessionManagement/Is/Response/SessionManagementStructIsDropboxResponse.php b/lib/SessionManagement/Is/Response/SessionManagementStructIsDropboxResponse.php
index 1aa3190..dcc0079 100644
--- a/lib/SessionManagement/Is/Response/SessionManagementStructIsDropboxResponse.php
+++ b/lib/SessionManagement/Is/Response/SessionManagementStructIsDropboxResponse.php
@@ -82,9 +82,9 @@ public function setIsDropboxResult($_isDropboxResult)
      * @param array $_array the exported values
      * @return SessionManagementStructIsDropboxResponse
      */
-    public static function __set_state(array $_array,$_className = __CLASS__)
+    public static function __set_state(array $_array)
     {
-        return parent::__set_state($_array,$_className);
+        return parent::__set_state($_array);
     }
     /**
      * Method returning the class name
diff --git a/lib/SessionManagement/List/Context/SessionManagementStructListFoldersResponseWithExternalContext.php b/lib/SessionManagement/List/Context/SessionManagementStructListFoldersResponseWithExternalContext.php
index 549f9f3..8419d81 100644
--- a/lib/SessionManagement/List/Context/SessionManagementStructListFoldersResponseWithExternalContext.php
+++ b/lib/SessionManagement/List/Context/SessionManagementStructListFoldersResponseWithExternalContext.php
@@ -108,9 +108,9 @@ public function setTotalNumberResults($_totalNumberResults)
      * @param array $_array the exported values
      * @return SessionManagementStructListFoldersResponseWithExternalContext
      */
-    public static function __set_state(array $_array,$_className = __CLASS__)
+    public static function __set_state(array $_array)
     {
-        return parent::__set_state($_array,$_className);
+        return parent::__set_state($_array);
     }
     /**
      * Method returning the class name
diff --git a/lib/SessionManagement/List/Notes/SessionManagementStructListNotes.php b/lib/SessionManagement/List/Notes/SessionManagementStructListNotes.php
index d2ec013..730744c 100644
--- a/lib/SessionManagement/List/Notes/SessionManagementStructListNotes.php
+++ b/lib/SessionManagement/List/Notes/SessionManagementStructListNotes.php
@@ -214,9 +214,9 @@ public function setSearchQuery($_searchQuery)
      * @param array $_array the exported values
      * @return SessionManagementStructListNotes
      */
-    public static function __set_state(array $_array,$_className = __CLASS__)
+    public static function __set_state(array $_array)
     {
-        return parent::__set_state($_array,$_className);
+        return parent::__set_state($_array);
     }
     /**
      * Method returning the class name
diff --git a/lib/SessionManagement/List/Request/SessionManagementStructListFoldersRequest.php b/lib/SessionManagement/List/Request/SessionManagementStructListFoldersRequest.php
index 92cf8d1..c9cb2e7 100644
--- a/lib/SessionManagement/List/Request/SessionManagementStructListFoldersRequest.php
+++ b/lib/SessionManagement/List/Request/SessionManagementStructListFoldersRequest.php
@@ -240,9 +240,9 @@ public function setUnmappedOnly($_unmappedOnly)
      * @param array $_array the exported values
      * @return SessionManagementStructListFoldersRequest
      */
-    public static function __set_state(array $_array,$_className = __CLASS__)
+    public static function __set_state(array $_array)
     {
-        return parent::__set_state($_array,$_className);
+        return parent::__set_state($_array);
     }
     /**
      * Method returning the class name
diff --git a/lib/SessionManagement/List/Request/SessionManagementStructListSessionsRequest.php b/lib/SessionManagement/List/Request/SessionManagementStructListSessionsRequest.php
index 30c878d..2ab18b9 100644
--- a/lib/SessionManagement/List/Request/SessionManagementStructListSessionsRequest.php
+++ b/lib/SessionManagement/List/Request/SessionManagementStructListSessionsRequest.php
@@ -270,9 +270,9 @@ public function setStates($_states)
      * @param array $_array the exported values
      * @return SessionManagementStructListSessionsRequest
      */
-    public static function __set_state(array $_array,$_className = __CLASS__)
+    public static function __set_state(array $_array)
     {
-        return parent::__set_state($_array,$_className);
+        return parent::__set_state($_array);
     }
     /**
      * Method returning the class name
diff --git a/lib/SessionManagement/List/Response/SessionManagementStructListFoldersResponse.php b/lib/SessionManagement/List/Response/SessionManagementStructListFoldersResponse.php
index 6289680..2efa09e 100644
--- a/lib/SessionManagement/List/Response/SessionManagementStructListFoldersResponse.php
+++ b/lib/SessionManagement/List/Response/SessionManagementStructListFoldersResponse.php
@@ -108,9 +108,9 @@ public function setTotalNumberResults($_totalNumberResults)
      * @param array $_array the exported values
      * @return SessionManagementStructListFoldersResponse
      */
-    public static function __set_state(array $_array,$_className = __CLASS__)
+    public static function __set_state(array $_array)
     {
-        return parent::__set_state($_array,$_className);
+        return parent::__set_state($_array);
     }
     /**
      * Method returning the class name
diff --git a/lib/SessionManagement/List/Response/SessionManagementStructListNotesResponse.php b/lib/SessionManagement/List/Response/SessionManagementStructListNotesResponse.php
index 8e7b7f6..3e54fef 100644
--- a/lib/SessionManagement/List/Response/SessionManagementStructListNotesResponse.php
+++ b/lib/SessionManagement/List/Response/SessionManagementStructListNotesResponse.php
@@ -135,9 +135,9 @@ public function setListNotesResult($_listNotesResult)
      * @param array $_array the exported values
      * @return SessionManagementStructListNotesResponse
      */
-    public static function __set_state(array $_array,$_className = __CLASS__)
+    public static function __set_state(array $_array)
     {
-        return parent::__set_state($_array,$_className);
+        return parent::__set_state($_array);
     }
     /**
      * Method returning the class name
diff --git a/lib/SessionManagement/List/Response/SessionManagementStructListSessionsResponse.php b/lib/SessionManagement/List/Response/SessionManagementStructListSessionsResponse.php
index b01e2c8..a4dd125 100644
--- a/lib/SessionManagement/List/Response/SessionManagementStructListSessionsResponse.php
+++ b/lib/SessionManagement/List/Response/SessionManagementStructListSessionsResponse.php
@@ -108,9 +108,9 @@ public function setTotalNumberResults($_totalNumberResults)
      * @param array $_array the exported values
      * @return SessionManagementStructListSessionsResponse
      */
-    public static function __set_state(array $_array,$_className = __CLASS__)
+    public static function __set_state(array $_array)
     {
-        return parent::__set_state($_array,$_className);
+        return parent::__set_state($_array);
     }
     /**
      * Method returning the class name
diff --git a/lib/SessionManagement/Move/Sessions/SessionManagementStructMoveSessions.php b/lib/SessionManagement/Move/Sessions/SessionManagementStructMoveSessions.php
index 6c8646f..2b0ca26 100644
--- a/lib/SessionManagement/Move/Sessions/SessionManagementStructMoveSessions.php
+++ b/lib/SessionManagement/Move/Sessions/SessionManagementStructMoveSessions.php
@@ -135,9 +135,9 @@ public function setFolderId($_folderId)
      * @param array $_array the exported values
      * @return SessionManagementStructMoveSessions
      */
-    public static function __set_state(array $_array,$_className = __CLASS__)
+    public static function __set_state(array $_array)
     {
-        return parent::__set_state($_array,$_className);
+        return parent::__set_state($_array);
     }
     /**
      * Method returning the class name
diff --git a/lib/SessionManagement/Note/SessionManagementStructNote.php b/lib/SessionManagement/Note/SessionManagementStructNote.php
index 7e1f258..7cbb080 100644
--- a/lib/SessionManagement/Note/SessionManagementStructNote.php
+++ b/lib/SessionManagement/Note/SessionManagementStructNote.php
@@ -212,9 +212,9 @@ public function setTimestamp($_timestamp)
      * @param array $_array the exported values
      * @return SessionManagementStructNote
      */
-    public static function __set_state(array $_array,$_className = __CLASS__)
+    public static function __set_state(array $_array)
     {
-        return parent::__set_state($_array,$_className);
+        return parent::__set_state($_array);
     }
     /**
      * Method returning the class name
diff --git a/lib/SessionManagement/Pagination/SessionManagementStructPagination.php b/lib/SessionManagement/Pagination/SessionManagementStructPagination.php
index c22ac13..30a8567 100644
--- a/lib/SessionManagement/Pagination/SessionManagementStructPagination.php
+++ b/lib/SessionManagement/Pagination/SessionManagementStructPagination.php
@@ -107,9 +107,9 @@ public function setPageNumber($_pageNumber)
      * @param array $_array the exported values
      * @return SessionManagementStructPagination
      */
-    public static function __set_state(array $_array,$_className = __CLASS__)
+    public static function __set_state(array $_array)
     {
-        return parent::__set_state($_array,$_className);
+        return parent::__set_state($_array);
     }
     /**
      * Method returning the class name
diff --git a/lib/SessionManagement/Provision/Course/SessionManagementStructProvisionExternalCourse.php b/lib/SessionManagement/Provision/Course/SessionManagementStructProvisionExternalCourse.php
index d9a4cbc..ebc1094 100644
--- a/lib/SessionManagement/Provision/Course/SessionManagementStructProvisionExternalCourse.php
+++ b/lib/SessionManagement/Provision/Course/SessionManagementStructProvisionExternalCourse.php
@@ -135,9 +135,9 @@ public function setExternalId($_externalId)
      * @param array $_array the exported values
      * @return SessionManagementStructProvisionExternalCourse
      */
-    public static function __set_state(array $_array,$_className = __CLASS__)
+    public static function __set_state(array $_array)
     {
-        return parent::__set_state($_array,$_className);
+        return parent::__set_state($_array);
     }
     /**
      * Method returning the class name
diff --git a/lib/SessionManagement/Provision/Response/SessionManagementStructProvisionExternalCourseResponse.php b/lib/SessionManagement/Provision/Response/SessionManagementStructProvisionExternalCourseResponse.php
index ff58cf9..496355b 100644
--- a/lib/SessionManagement/Provision/Response/SessionManagementStructProvisionExternalCourseResponse.php
+++ b/lib/SessionManagement/Provision/Response/SessionManagementStructProvisionExternalCourseResponse.php
@@ -83,9 +83,9 @@ public function setProvisionExternalCourseResult($_provisionExternalCourseResult
      * @param array $_array the exported values
      * @return SessionManagementStructProvisionExternalCourseResponse
      */
-    public static function __set_state(array $_array,$_className = __CLASS__)
+    public static function __set_state(array $_array)
     {
-        return parent::__set_state($_array,$_className);
+        return parent::__set_state($_array);
     }
     /**
      * Method returning the class name
diff --git a/lib/SessionManagement/Provision/Response/SessionManagementStructProvisionExternalCourseWithRolesResponse.php b/lib/SessionManagement/Provision/Response/SessionManagementStructProvisionExternalCourseWithRolesResponse.php
index 5a93dc6..d202d7c 100644
--- a/lib/SessionManagement/Provision/Response/SessionManagementStructProvisionExternalCourseWithRolesResponse.php
+++ b/lib/SessionManagement/Provision/Response/SessionManagementStructProvisionExternalCourseWithRolesResponse.php
@@ -83,9 +83,9 @@ public function setProvisionExternalCourseWithRolesResult($_provisionExternalCou
      * @param array $_array the exported values
      * @return SessionManagementStructProvisionExternalCourseWithRolesResponse
      */
-    public static function __set_state(array $_array,$_className = __CLASS__)
+    public static function __set_state(array $_array)
     {
-        return parent::__set_state($_array,$_className);
+        return parent::__set_state($_array);
     }
     /**
      * Method returning the class name
diff --git a/lib/SessionManagement/Provision/Roles/SessionManagementStructProvisionExternalCourseWithRoles.php b/lib/SessionManagement/Provision/Roles/SessionManagementStructProvisionExternalCourseWithRoles.php
index 0ce8e46..5496427 100644
--- a/lib/SessionManagement/Provision/Roles/SessionManagementStructProvisionExternalCourseWithRoles.php
+++ b/lib/SessionManagement/Provision/Roles/SessionManagementStructProvisionExternalCourseWithRoles.php
@@ -161,9 +161,9 @@ public function setRoles($_roles)
      * @param array $_array the exported values
      * @return SessionManagementStructProvisionExternalCourseWithRoles
      */
-    public static function __set_state(array $_array,$_className = __CLASS__)
+    public static function __set_state(array $_array)
     {
-        return parent::__set_state($_array,$_className);
+        return parent::__set_state($_array);
     }
     /**
      * Method returning the class name
diff --git a/lib/SessionManagement/Recorder/Response/SessionManagementStructRecorderDownloadUrlResponse.php b/lib/SessionManagement/Recorder/Response/SessionManagementStructRecorderDownloadUrlResponse.php
index 910d9ae..27bc3b2 100644
--- a/lib/SessionManagement/Recorder/Response/SessionManagementStructRecorderDownloadUrlResponse.php
+++ b/lib/SessionManagement/Recorder/Response/SessionManagementStructRecorderDownloadUrlResponse.php
@@ -135,9 +135,9 @@ public function setWindowsRemoteRecorderDownloadUrl($_windowsRemoteRecorderDownl
      * @param array $_array the exported values
      * @return SessionManagementStructRecorderDownloadUrlResponse
      */
-    public static function __set_state(array $_array,$_className = __CLASS__)
+    public static function __set_state(array $_array)
     {
-        return parent::__set_state($_array,$_className);
+        return parent::__set_state($_array);
     }
     /**
      * Method returning the class name
diff --git a/lib/SessionManagement/Session/SessionManagementStructSession.php b/lib/SessionManagement/Session/SessionManagementStructSession.php
index 2275220..cb30732 100644
--- a/lib/SessionManagement/Session/SessionManagementStructSession.php
+++ b/lib/SessionManagement/Session/SessionManagementStructSession.php
@@ -657,9 +657,9 @@ public function setViewerUrl($_viewerUrl)
      * @param array $_array the exported values
      * @return SessionManagementStructSession
      */
-    public static function __set_state(array $_array,$_className = __CLASS__)
+    public static function __set_state(array $_array)
     {
-        return parent::__set_state($_array,$_className);
+        return parent::__set_state($_array);
     }
     /**
      * Method returning the class name
diff --git a/lib/SessionManagement/Session/Settings/SessionManagementStructSessionAvailabilitySettings.php b/lib/SessionManagement/Session/Settings/SessionManagementStructSessionAvailabilitySettings.php
index 3668408..a03c023 100644
--- a/lib/SessionManagement/Session/Settings/SessionManagementStructSessionAvailabilitySettings.php
+++ b/lib/SessionManagement/Session/Settings/SessionManagementStructSessionAvailabilitySettings.php
@@ -195,9 +195,9 @@ public function setStartSettingType($_startSettingType)
      * @param array $_array the exported values
      * @return SessionManagementStructSessionAvailabilitySettings
      */
-    public static function __set_state(array $_array,$_className = __CLASS__)
+    public static function __set_state(array $_array)
     {
-        return parent::__set_state($_array,$_className);
+        return parent::__set_state($_array);
     }
     /**
      * Method returning the class name
diff --git a/lib/SessionManagement/SessionManagementWsdlClass.php b/lib/SessionManagement/SessionManagementWsdlClass.php
index 910d216..a4fb159 100644
--- a/lib/SessionManagement/SessionManagementWsdlClass.php
+++ b/lib/SessionManagement/SessionManagementWsdlClass.php
@@ -253,8 +253,9 @@ public function __construct($_arrayOfValues = array(),$_resetSoapClient = true)
      * @param string $_className optional (used by inherited classes in order to always call this method)
      * @return SessionManagementWsdlClass|null
      */
-    public static function __set_state(array $_array,$_className = __CLASS__)
+    public static function __set_state(array $_array)
     {
+        $_className = __CLASS__;
         if(class_exists($_className))
         {
             $object = @new $_className();
diff --git a/lib/SessionManagement/Sessions/Settings/SessionManagementStructSessionsWithAvailabilitySettings.php b/lib/SessionManagement/Sessions/Settings/SessionManagementStructSessionsWithAvailabilitySettings.php
index 2db9641..078b6cd 100644
--- a/lib/SessionManagement/Sessions/Settings/SessionManagementStructSessionsWithAvailabilitySettings.php
+++ b/lib/SessionManagement/Sessions/Settings/SessionManagementStructSessionsWithAvailabilitySettings.php
@@ -108,9 +108,9 @@ public function setTotalNumberResults($_totalNumberResults)
      * @param array $_array the exported values
      * @return SessionManagementStructSessionsWithAvailabilitySettings
      */
-    public static function __set_state(array $_array,$_className = __CLASS__)
+    public static function __set_state(array $_array)
     {
-        return parent::__set_state($_array,$_className);
+        return parent::__set_state($_array);
     }
     /**
      * Method returning the class name
diff --git a/lib/SessionManagement/Set/Access/SessionManagementStructSetCopiedExternalCourseAccess.php b/lib/SessionManagement/Set/Access/SessionManagementStructSetCopiedExternalCourseAccess.php
index 15ed425..0f3ab2d 100644
--- a/lib/SessionManagement/Set/Access/SessionManagementStructSetCopiedExternalCourseAccess.php
+++ b/lib/SessionManagement/Set/Access/SessionManagementStructSetCopiedExternalCourseAccess.php
@@ -161,9 +161,9 @@ public function setFolderIds($_folderIds)
      * @param array $_array the exported values
      * @return SessionManagementStructSetCopiedExternalCourseAccess
      */
-    public static function __set_state(array $_array,$_className = __CLASS__)
+    public static function __set_state(array $_array)
     {
-        return parent::__set_state($_array,$_className);
+        return parent::__set_state($_array);
     }
     /**
      * Method returning the class name
diff --git a/lib/SessionManagement/Set/Access/SessionManagementStructSetExternalCourseAccess.php b/lib/SessionManagement/Set/Access/SessionManagementStructSetExternalCourseAccess.php
index 3098678..eb908bc 100644
--- a/lib/SessionManagement/Set/Access/SessionManagementStructSetExternalCourseAccess.php
+++ b/lib/SessionManagement/Set/Access/SessionManagementStructSetExternalCourseAccess.php
@@ -161,9 +161,9 @@ public function setFolderIds($_folderIds)
      * @param array $_array the exported values
      * @return SessionManagementStructSetExternalCourseAccess
      */
-    public static function __set_state(array $_array,$_className = __CLASS__)
+    public static function __set_state(array $_array)
     {
-        return parent::__set_state($_array,$_className);
+        return parent::__set_state($_array);
     }
     /**
      * Method returning the class name
diff --git a/lib/SessionManagement/Set/Public/SessionManagementStructSetNotesPublic.php b/lib/SessionManagement/Set/Public/SessionManagementStructSetNotesPublic.php
index bb83c6f..4497a2e 100644
--- a/lib/SessionManagement/Set/Public/SessionManagementStructSetNotesPublic.php
+++ b/lib/SessionManagement/Set/Public/SessionManagementStructSetNotesPublic.php
@@ -134,9 +134,9 @@ public function setAreNotesPublic($_areNotesPublic)
      * @param array $_array the exported values
      * @return SessionManagementStructSetNotesPublic
      */
-    public static function __set_state(array $_array,$_className = __CLASS__)
+    public static function __set_state(array $_array)
     {
-        return parent::__set_state($_array,$_className);
+        return parent::__set_state($_array);
     }
     /**
      * Method returning the class name
diff --git a/lib/SessionManagement/Set/Response/SessionManagementStructSetCopiedExternalCourseAccessForRolesResponse.php b/lib/SessionManagement/Set/Response/SessionManagementStructSetCopiedExternalCourseAccessForRolesResponse.php
index 757424b..06050b4 100644
--- a/lib/SessionManagement/Set/Response/SessionManagementStructSetCopiedExternalCourseAccessForRolesResponse.php
+++ b/lib/SessionManagement/Set/Response/SessionManagementStructSetCopiedExternalCourseAccessForRolesResponse.php
@@ -83,9 +83,9 @@ public function setSetCopiedExternalCourseAccessForRolesResult($_setCopiedExtern
      * @param array $_array the exported values
      * @return SessionManagementStructSetCopiedExternalCourseAccessForRolesResponse
      */
-    public static function __set_state(array $_array,$_className = __CLASS__)
+    public static function __set_state(array $_array)
     {
-        return parent::__set_state($_array,$_className);
+        return parent::__set_state($_array);
     }
     /**
      * Method returning the class name
diff --git a/lib/SessionManagement/Set/Response/SessionManagementStructSetCopiedExternalCourseAccessResponse.php b/lib/SessionManagement/Set/Response/SessionManagementStructSetCopiedExternalCourseAccessResponse.php
index f60ce27..1a060c3 100644
--- a/lib/SessionManagement/Set/Response/SessionManagementStructSetCopiedExternalCourseAccessResponse.php
+++ b/lib/SessionManagement/Set/Response/SessionManagementStructSetCopiedExternalCourseAccessResponse.php
@@ -83,9 +83,9 @@ public function setSetCopiedExternalCourseAccessResult($_setCopiedExternalCourse
      * @param array $_array the exported values
      * @return SessionManagementStructSetCopiedExternalCourseAccessResponse
      */
-    public static function __set_state(array $_array,$_className = __CLASS__)
+    public static function __set_state(array $_array)
     {
-        return parent::__set_state($_array,$_className);
+        return parent::__set_state($_array);
     }
     /**
      * Method returning the class name
diff --git a/lib/SessionManagement/Set/Response/SessionManagementStructSetExternalCourseAccessForRolesResponse.php b/lib/SessionManagement/Set/Response/SessionManagementStructSetExternalCourseAccessForRolesResponse.php
index a563b1f..31126d0 100644
--- a/lib/SessionManagement/Set/Response/SessionManagementStructSetExternalCourseAccessForRolesResponse.php
+++ b/lib/SessionManagement/Set/Response/SessionManagementStructSetExternalCourseAccessForRolesResponse.php
@@ -83,9 +83,9 @@ public function setSetExternalCourseAccessForRolesResult($_setExternalCourseAcce
      * @param array $_array the exported values
      * @return SessionManagementStructSetExternalCourseAccessForRolesResponse
      */
-    public static function __set_state(array $_array,$_className = __CLASS__)
+    public static function __set_state(array $_array)
     {
-        return parent::__set_state($_array,$_className);
+        return parent::__set_state($_array);
     }
     /**
      * Method returning the class name
diff --git a/lib/SessionManagement/Set/Response/SessionManagementStructSetExternalCourseAccessResponse.php b/lib/SessionManagement/Set/Response/SessionManagementStructSetExternalCourseAccessResponse.php
index 9bae776..b8af165 100644
--- a/lib/SessionManagement/Set/Response/SessionManagementStructSetExternalCourseAccessResponse.php
+++ b/lib/SessionManagement/Set/Response/SessionManagementStructSetExternalCourseAccessResponse.php
@@ -83,9 +83,9 @@ public function setSetExternalCourseAccessResult($_setExternalCourseAccessResult
      * @param array $_array the exported values
      * @return SessionManagementStructSetExternalCourseAccessResponse
      */
-    public static function __set_state(array $_array,$_className = __CLASS__)
+    public static function __set_state(array $_array)
     {
-        return parent::__set_state($_array,$_className);
+        return parent::__set_state($_array);
     }
     /**
      * Method returning the class name
diff --git a/lib/SessionManagement/Set/Roles/SessionManagementStructSetCopiedExternalCourseAccessForRoles.php b/lib/SessionManagement/Set/Roles/SessionManagementStructSetCopiedExternalCourseAccessForRoles.php
index ee13f0e..716847d 100644
--- a/lib/SessionManagement/Set/Roles/SessionManagementStructSetCopiedExternalCourseAccessForRoles.php
+++ b/lib/SessionManagement/Set/Roles/SessionManagementStructSetCopiedExternalCourseAccessForRoles.php
@@ -187,9 +187,9 @@ public function setRoles($_roles)
      * @param array $_array the exported values
      * @return SessionManagementStructSetCopiedExternalCourseAccessForRoles
      */
-    public static function __set_state(array $_array,$_className = __CLASS__)
+    public static function __set_state(array $_array)
     {
-        return parent::__set_state($_array,$_className);
+        return parent::__set_state($_array);
     }
     /**
      * Method returning the class name
diff --git a/lib/SessionManagement/Set/Roles/SessionManagementStructSetExternalCourseAccessForRoles.php b/lib/SessionManagement/Set/Roles/SessionManagementStructSetExternalCourseAccessForRoles.php
index b5b4f85..e28611d 100644
--- a/lib/SessionManagement/Set/Roles/SessionManagementStructSetExternalCourseAccessForRoles.php
+++ b/lib/SessionManagement/Set/Roles/SessionManagementStructSetExternalCourseAccessForRoles.php
@@ -187,9 +187,9 @@ public function setRoles($_roles)
      * @param array $_array the exported values
      * @return SessionManagementStructSetExternalCourseAccessForRoles
      */
-    public static function __set_state(array $_array,$_className = __CLASS__)
+    public static function __set_state(array $_array)
     {
-        return parent::__set_state($_array,$_className);
+        return parent::__set_state($_array);
     }
     /**
      * Method returning the class name
diff --git a/lib/SessionManagement/Unprovision/Course/SessionManagementStructUnprovisionExternalCourse.php b/lib/SessionManagement/Unprovision/Course/SessionManagementStructUnprovisionExternalCourse.php
index 7c7ab65..3b9cbdb 100644
--- a/lib/SessionManagement/Unprovision/Course/SessionManagementStructUnprovisionExternalCourse.php
+++ b/lib/SessionManagement/Unprovision/Course/SessionManagementStructUnprovisionExternalCourse.php
@@ -109,9 +109,9 @@ public function setexternalContextId($_externalContextId)
      * @param array $_array the exported values
      * @return SessionManagementStructUnprovisionExternalCourse
      */
-    public static function __set_state(array $_array,$_className = __CLASS__)
+    public static function __set_state(array $_array)
     {
-        return parent::__set_state($_array,$_className);
+        return parent::__set_state($_array);
     }
     /**
      * Method returning the class name
diff --git a/lib/SessionManagement/Update/Broadcast/SessionManagementStructUpdateSessionIsBroadcast.php b/lib/SessionManagement/Update/Broadcast/SessionManagementStructUpdateSessionIsBroadcast.php
index b624949..587a028 100644
--- a/lib/SessionManagement/Update/Broadcast/SessionManagementStructUpdateSessionIsBroadcast.php
+++ b/lib/SessionManagement/Update/Broadcast/SessionManagementStructUpdateSessionIsBroadcast.php
@@ -134,9 +134,9 @@ public function setIsBroadcast($_isBroadcast)
      * @param array $_array the exported values
      * @return SessionManagementStructUpdateSessionIsBroadcast
      */
-    public static function __set_state(array $_array,$_className = __CLASS__)
+    public static function __set_state(array $_array)
     {
-        return parent::__set_state($_array,$_className);
+        return parent::__set_state($_array);
     }
     /**
      * Method returning the class name
diff --git a/lib/SessionManagement/Update/Description/SessionManagementStructUpdateFolderDescription.php b/lib/SessionManagement/Update/Description/SessionManagementStructUpdateFolderDescription.php
index 4f7edda..8e3129e 100644
--- a/lib/SessionManagement/Update/Description/SessionManagementStructUpdateFolderDescription.php
+++ b/lib/SessionManagement/Update/Description/SessionManagementStructUpdateFolderDescription.php
@@ -135,9 +135,9 @@ public function setDescription($_description)
      * @param array $_array the exported values
      * @return SessionManagementStructUpdateFolderDescription
      */
-    public static function __set_state(array $_array,$_className = __CLASS__)
+    public static function __set_state(array $_array)
     {
-        return parent::__set_state($_array,$_className);
+        return parent::__set_state($_array);
     }
     /**
      * Method returning the class name
diff --git a/lib/SessionManagement/Update/Description/SessionManagementStructUpdateSessionDescription.php b/lib/SessionManagement/Update/Description/SessionManagementStructUpdateSessionDescription.php
index 486b96b..f89dcf0 100644
--- a/lib/SessionManagement/Update/Description/SessionManagementStructUpdateSessionDescription.php
+++ b/lib/SessionManagement/Update/Description/SessionManagementStructUpdateSessionDescription.php
@@ -135,9 +135,9 @@ public function setDescription($_description)
      * @param array $_array the exported values
      * @return SessionManagementStructUpdateSessionDescription
      */
-    public static function __set_state(array $_array,$_className = __CLASS__)
+    public static function __set_state(array $_array)
     {
-        return parent::__set_state($_array,$_className);
+        return parent::__set_state($_array);
     }
     /**
      * Method returning the class name
diff --git a/lib/SessionManagement/Update/Download/SessionManagementStructUpdateFolderAllowSessionDownload.php b/lib/SessionManagement/Update/Download/SessionManagementStructUpdateFolderAllowSessionDownload.php
index 06bcd13..c6002f4 100644
--- a/lib/SessionManagement/Update/Download/SessionManagementStructUpdateFolderAllowSessionDownload.php
+++ b/lib/SessionManagement/Update/Download/SessionManagementStructUpdateFolderAllowSessionDownload.php
@@ -134,9 +134,9 @@ public function setAllowSessionDownload($_allowSessionDownload)
      * @param array $_array the exported values
      * @return SessionManagementStructUpdateFolderAllowSessionDownload
      */
-    public static function __set_state(array $_array,$_className = __CLASS__)
+    public static function __set_state(array $_array)
     {
-        return parent::__set_state($_array,$_className);
+        return parent::__set_state($_array);
     }
     /**
      * Method returning the class name
diff --git a/lib/SessionManagement/Update/Id/SessionManagementStructUpdateFolderExternalId.php b/lib/SessionManagement/Update/Id/SessionManagementStructUpdateFolderExternalId.php
index 1a33100..5eb8659 100644
--- a/lib/SessionManagement/Update/Id/SessionManagementStructUpdateFolderExternalId.php
+++ b/lib/SessionManagement/Update/Id/SessionManagementStructUpdateFolderExternalId.php
@@ -135,9 +135,9 @@ public function setExternalId($_externalId)
      * @param array $_array the exported values
      * @return SessionManagementStructUpdateFolderExternalId
      */
-    public static function __set_state(array $_array,$_className = __CLASS__)
+    public static function __set_state(array $_array)
     {
-        return parent::__set_state($_array,$_className);
+        return parent::__set_state($_array);
     }
     /**
      * Method returning the class name
diff --git a/lib/SessionManagement/Update/Id/SessionManagementStructUpdateSessionExternalId.php b/lib/SessionManagement/Update/Id/SessionManagementStructUpdateSessionExternalId.php
index 9c124b0..fd0ebf6 100644
--- a/lib/SessionManagement/Update/Id/SessionManagementStructUpdateSessionExternalId.php
+++ b/lib/SessionManagement/Update/Id/SessionManagementStructUpdateSessionExternalId.php
@@ -135,9 +135,9 @@ public function setExternalId($_externalId)
      * @param array $_array the exported values
      * @return SessionManagementStructUpdateSessionExternalId
      */
-    public static function __set_state(array $_array,$_className = __CLASS__)
+    public static function __set_state(array $_array)
     {
-        return parent::__set_state($_array,$_className);
+        return parent::__set_state($_array);
     }
     /**
      * Method returning the class name
diff --git a/lib/SessionManagement/Update/Name/SessionManagementStructUpdateFolderName.php b/lib/SessionManagement/Update/Name/SessionManagementStructUpdateFolderName.php
index 6cbbbd5..9baeb18 100644
--- a/lib/SessionManagement/Update/Name/SessionManagementStructUpdateFolderName.php
+++ b/lib/SessionManagement/Update/Name/SessionManagementStructUpdateFolderName.php
@@ -135,9 +135,9 @@ public function setName($_name)
      * @param array $_array the exported values
      * @return SessionManagementStructUpdateFolderName
      */
-    public static function __set_state(array $_array,$_className = __CLASS__)
+    public static function __set_state(array $_array)
     {
-        return parent::__set_state($_array,$_className);
+        return parent::__set_state($_array);
     }
     /**
      * Method returning the class name
diff --git a/lib/SessionManagement/Update/Name/SessionManagementStructUpdateSessionName.php b/lib/SessionManagement/Update/Name/SessionManagementStructUpdateSessionName.php
index c61e2ef..72c14b4 100644
--- a/lib/SessionManagement/Update/Name/SessionManagementStructUpdateSessionName.php
+++ b/lib/SessionManagement/Update/Name/SessionManagementStructUpdateSessionName.php
@@ -135,9 +135,9 @@ public function setName($_name)
      * @param array $_array the exported values
      * @return SessionManagementStructUpdateSessionName
      */
-    public static function __set_state(array $_array,$_className = __CLASS__)
+    public static function __set_state(array $_array)
     {
-        return parent::__set_state($_array,$_className);
+        return parent::__set_state($_array);
     }
     /**
      * Method returning the class name
diff --git a/lib/SessionManagement/Update/Notes/SessionManagementStructUpdateFolderAllowPublicNotes.php b/lib/SessionManagement/Update/Notes/SessionManagementStructUpdateFolderAllowPublicNotes.php
index 4012a45..3549a02 100644
--- a/lib/SessionManagement/Update/Notes/SessionManagementStructUpdateFolderAllowPublicNotes.php
+++ b/lib/SessionManagement/Update/Notes/SessionManagementStructUpdateFolderAllowPublicNotes.php
@@ -134,9 +134,9 @@ public function setAllowPublicNotes($_allowPublicNotes)
      * @param array $_array the exported values
      * @return SessionManagementStructUpdateFolderAllowPublicNotes
      */
-    public static function __set_state(array $_array,$_className = __CLASS__)
+    public static function __set_state(array $_array)
     {
-        return parent::__set_state($_array,$_className);
+        return parent::__set_state($_array);
     }
     /**
      * Method returning the class name
diff --git a/lib/SessionManagement/Update/Owner/SessionManagementStructUpdateSessionOwner.php b/lib/SessionManagement/Update/Owner/SessionManagementStructUpdateSessionOwner.php
index 60eb7e5..92afc21 100644
--- a/lib/SessionManagement/Update/Owner/SessionManagementStructUpdateSessionOwner.php
+++ b/lib/SessionManagement/Update/Owner/SessionManagementStructUpdateSessionOwner.php
@@ -135,9 +135,9 @@ public function setNewOwnerUserKey($_newOwnerUserKey)
      * @param array $_array the exported values
      * @return SessionManagementStructUpdateSessionOwner
      */
-    public static function __set_state(array $_array,$_className = __CLASS__)
+    public static function __set_state(array $_array)
     {
-        return parent::__set_state($_array,$_className);
+        return parent::__set_state($_array);
     }
     /**
      * Method returning the class name
diff --git a/lib/SessionManagement/Update/Parent/SessionManagementStructUpdateFolderParent.php b/lib/SessionManagement/Update/Parent/SessionManagementStructUpdateFolderParent.php
index 5e45728..c89e22e 100644
--- a/lib/SessionManagement/Update/Parent/SessionManagementStructUpdateFolderParent.php
+++ b/lib/SessionManagement/Update/Parent/SessionManagementStructUpdateFolderParent.php
@@ -136,9 +136,9 @@ public function setParentId($_parentId)
      * @param array $_array the exported values
      * @return SessionManagementStructUpdateFolderParent
      */
-    public static function __set_state(array $_array,$_className = __CLASS__)
+    public static function __set_state(array $_array)
     {
-        return parent::__set_state($_array,$_className);
+        return parent::__set_state($_array);
     }
     /**
      * Method returning the class name
diff --git a/lib/SessionManagement/Update/Podcast/SessionManagementStructUpdateFolderEnablePodcast.php b/lib/SessionManagement/Update/Podcast/SessionManagementStructUpdateFolderEnablePodcast.php
index f4ee7fa..31d4bb9 100644
--- a/lib/SessionManagement/Update/Podcast/SessionManagementStructUpdateFolderEnablePodcast.php
+++ b/lib/SessionManagement/Update/Podcast/SessionManagementStructUpdateFolderEnablePodcast.php
@@ -134,9 +134,9 @@ public function setEnablePodcast($_enablePodcast)
      * @param array $_array the exported values
      * @return SessionManagementStructUpdateFolderEnablePodcast
      */
-    public static function __set_state(array $_array,$_className = __CLASS__)
+    public static function __set_state(array $_array)
     {
-        return parent::__set_state($_array,$_className);
+        return parent::__set_state($_array);
     }
     /**
      * Method returning the class name
diff --git a/lib/SessionManagement/Update/Provider/SessionManagementStructUpdateFolderExternalIdWithProvider.php b/lib/SessionManagement/Update/Provider/SessionManagementStructUpdateFolderExternalIdWithProvider.php
index 9ce654f..983ce6b 100644
--- a/lib/SessionManagement/Update/Provider/SessionManagementStructUpdateFolderExternalIdWithProvider.php
+++ b/lib/SessionManagement/Update/Provider/SessionManagementStructUpdateFolderExternalIdWithProvider.php
@@ -161,9 +161,9 @@ public function setSiteMembershipProviderName($_siteMembershipProviderName)
      * @param array $_array the exported values
      * @return SessionManagementStructUpdateFolderExternalIdWithProvider
      */
-    public static function __set_state(array $_array,$_className = __CLASS__)
+    public static function __set_state(array $_array)
     {
-        return parent::__set_state($_array,$_className);
+        return parent::__set_state($_array);
     }
     /**
      * Method returning the class name
diff --git a/lib/SessionManagement/Update/Response/SessionManagementStructUpdateFoldersAvailabilityEndSettingsResponse.php b/lib/SessionManagement/Update/Response/SessionManagementStructUpdateFoldersAvailabilityEndSettingsResponse.php
index e741838..322247f 100644
--- a/lib/SessionManagement/Update/Response/SessionManagementStructUpdateFoldersAvailabilityEndSettingsResponse.php
+++ b/lib/SessionManagement/Update/Response/SessionManagementStructUpdateFoldersAvailabilityEndSettingsResponse.php
@@ -82,9 +82,9 @@ public function setUpdateFoldersAvailabilityEndSettingsResult($_updateFoldersAva
      * @param array $_array the exported values
      * @return SessionManagementStructUpdateFoldersAvailabilityEndSettingsResponse
      */
-    public static function __set_state(array $_array,$_className = __CLASS__)
+    public static function __set_state(array $_array)
     {
-        return parent::__set_state($_array,$_className);
+        return parent::__set_state($_array);
     }
     /**
      * Method returning the class name
diff --git a/lib/SessionManagement/Update/Response/SessionManagementStructUpdateFoldersAvailabilityStartSettingsResponse.php b/lib/SessionManagement/Update/Response/SessionManagementStructUpdateFoldersAvailabilityStartSettingsResponse.php
index d512dec..a82b93e 100644
--- a/lib/SessionManagement/Update/Response/SessionManagementStructUpdateFoldersAvailabilityStartSettingsResponse.php
+++ b/lib/SessionManagement/Update/Response/SessionManagementStructUpdateFoldersAvailabilityStartSettingsResponse.php
@@ -82,9 +82,9 @@ public function setUpdateFoldersAvailabilityStartSettingsResult($_updateFoldersA
      * @param array $_array the exported values
      * @return SessionManagementStructUpdateFoldersAvailabilityStartSettingsResponse
      */
-    public static function __set_state(array $_array,$_className = __CLASS__)
+    public static function __set_state(array $_array)
     {
-        return parent::__set_state($_array,$_className);
+        return parent::__set_state($_array);
     }
     /**
      * Method returning the class name
diff --git a/lib/SessionManagement/Update/Response/SessionManagementStructUpdateSessionsAvailabilityEndSettingsResponse.php b/lib/SessionManagement/Update/Response/SessionManagementStructUpdateSessionsAvailabilityEndSettingsResponse.php
index 638d7f2..7731087 100644
--- a/lib/SessionManagement/Update/Response/SessionManagementStructUpdateSessionsAvailabilityEndSettingsResponse.php
+++ b/lib/SessionManagement/Update/Response/SessionManagementStructUpdateSessionsAvailabilityEndSettingsResponse.php
@@ -82,9 +82,9 @@ public function setUpdateSessionsAvailabilityEndSettingsResult($_updateSessionsA
      * @param array $_array the exported values
      * @return SessionManagementStructUpdateSessionsAvailabilityEndSettingsResponse
      */
-    public static function __set_state(array $_array,$_className = __CLASS__)
+    public static function __set_state(array $_array)
     {
-        return parent::__set_state($_array,$_className);
+        return parent::__set_state($_array);
     }
     /**
      * Method returning the class name
diff --git a/lib/SessionManagement/Update/Response/SessionManagementStructUpdateSessionsAvailabilityStartSettingsResponse.php b/lib/SessionManagement/Update/Response/SessionManagementStructUpdateSessionsAvailabilityStartSettingsResponse.php
index 7089c5f..b6bd04f 100644
--- a/lib/SessionManagement/Update/Response/SessionManagementStructUpdateSessionsAvailabilityStartSettingsResponse.php
+++ b/lib/SessionManagement/Update/Response/SessionManagementStructUpdateSessionsAvailabilityStartSettingsResponse.php
@@ -82,9 +82,9 @@ public function setUpdateSessionsAvailabilityStartSettingsResult($_updateSession
      * @param array $_array the exported values
      * @return SessionManagementStructUpdateSessionsAvailabilityStartSettingsResponse
      */
-    public static function __set_state(array $_array,$_className = __CLASS__)
+    public static function __set_state(array $_array)
     {
-        return parent::__set_state($_array,$_className);
+        return parent::__set_state($_array);
     }
     /**
      * Method returning the class name
diff --git a/lib/SessionManagement/Update/Settings/SessionManagementStructUpdateFoldersAvailabilityEndSettings.php b/lib/SessionManagement/Update/Settings/SessionManagementStructUpdateFoldersAvailabilityEndSettings.php
index 2c23ab0..6b7048f 100644
--- a/lib/SessionManagement/Update/Settings/SessionManagementStructUpdateFoldersAvailabilityEndSettings.php
+++ b/lib/SessionManagement/Update/Settings/SessionManagementStructUpdateFoldersAvailabilityEndSettings.php
@@ -190,9 +190,9 @@ public function setOverrideSessionsSettings($_overrideSessionsSettings)
      * @param array $_array the exported values
      * @return SessionManagementStructUpdateFoldersAvailabilityEndSettings
      */
-    public static function __set_state(array $_array,$_className = __CLASS__)
+    public static function __set_state(array $_array)
     {
-        return parent::__set_state($_array,$_className);
+        return parent::__set_state($_array);
     }
     /**
      * Method returning the class name
diff --git a/lib/SessionManagement/Update/Settings/SessionManagementStructUpdateFoldersAvailabilityStartSettings.php b/lib/SessionManagement/Update/Settings/SessionManagementStructUpdateFoldersAvailabilityStartSettings.php
index 1dbda73..5080d03 100644
--- a/lib/SessionManagement/Update/Settings/SessionManagementStructUpdateFoldersAvailabilityStartSettings.php
+++ b/lib/SessionManagement/Update/Settings/SessionManagementStructUpdateFoldersAvailabilityStartSettings.php
@@ -190,9 +190,9 @@ public function setOverrideSessionsSettings($_overrideSessionsSettings)
      * @param array $_array the exported values
      * @return SessionManagementStructUpdateFoldersAvailabilityStartSettings
      */
-    public static function __set_state(array $_array,$_className = __CLASS__)
+    public static function __set_state(array $_array)
     {
-        return parent::__set_state($_array,$_className);
+        return parent::__set_state($_array);
     }
     /**
      * Method returning the class name
diff --git a/lib/SessionManagement/Update/Settings/SessionManagementStructUpdateSessionsAvailabilityEndSettings.php b/lib/SessionManagement/Update/Settings/SessionManagementStructUpdateSessionsAvailabilityEndSettings.php
index 0c243b3..715601b 100644
--- a/lib/SessionManagement/Update/Settings/SessionManagementStructUpdateSessionsAvailabilityEndSettings.php
+++ b/lib/SessionManagement/Update/Settings/SessionManagementStructUpdateSessionsAvailabilityEndSettings.php
@@ -165,9 +165,9 @@ public function setEndDate($_endDate)
      * @param array $_array the exported values
      * @return SessionManagementStructUpdateSessionsAvailabilityEndSettings
      */
-    public static function __set_state(array $_array,$_className = __CLASS__)
+    public static function __set_state(array $_array)
     {
-        return parent::__set_state($_array,$_className);
+        return parent::__set_state($_array);
     }
     /**
      * Method returning the class name
diff --git a/lib/SessionManagement/Update/Settings/SessionManagementStructUpdateSessionsAvailabilityStartSettings.php b/lib/SessionManagement/Update/Settings/SessionManagementStructUpdateSessionsAvailabilityStartSettings.php
index cb03ce2..966d278 100644
--- a/lib/SessionManagement/Update/Settings/SessionManagementStructUpdateSessionsAvailabilityStartSettings.php
+++ b/lib/SessionManagement/Update/Settings/SessionManagementStructUpdateSessionsAvailabilityStartSettings.php
@@ -165,9 +165,9 @@ public function setStartDate($_startDate)
      * @param array $_array the exported values
      * @return SessionManagementStructUpdateSessionsAvailabilityStartSettings
      */
-    public static function __set_state(array $_array,$_className = __CLASS__)
+    public static function __set_state(array $_array)
     {
-        return parent::__set_state($_array,$_className);
+        return parent::__set_state($_array);
     }
     /**
      * Method returning the class name
diff --git a/lib/SessionManagement/Upload/Transcript/SessionManagementStructUploadTranscript.php b/lib/SessionManagement/Upload/Transcript/SessionManagementStructUploadTranscript.php
index 7e0519b..a93423f 100644
--- a/lib/SessionManagement/Upload/Transcript/SessionManagementStructUploadTranscript.php
+++ b/lib/SessionManagement/Upload/Transcript/SessionManagementStructUploadTranscript.php
@@ -135,9 +135,9 @@ public function setFile($_file)
      * @param array $_array the exported values
      * @return SessionManagementStructUploadTranscript
      */
-    public static function __set_state(array $_array,$_className = __CLASS__)
+    public static function __set_state(array $_array)
     {
-        return parent::__set_state($_array,$_className);
+        return parent::__set_state($_array);
     }
     /**
      * Method returning the class name
diff --git a/lib/UserManagement/Add/Group/UserManagementStructAddMembersToExternalGroup.php b/lib/UserManagement/Add/Group/UserManagementStructAddMembersToExternalGroup.php
index 7486413..d3e3ecf 100644
--- a/lib/UserManagement/Add/Group/UserManagementStructAddMembersToExternalGroup.php
+++ b/lib/UserManagement/Add/Group/UserManagementStructAddMembersToExternalGroup.php
@@ -161,9 +161,9 @@ public function setMemberIds($_memberIds)
      * @param array $_array the exported values
      * @return UserManagementStructAddMembersToExternalGroup
      */
-    public static function __set_state(array $_array,$_className = __CLASS__)
+    public static function __set_state(array $_array)
     {
-        return parent::__set_state($_array,$_className);
+        return parent::__set_state($_array);
     }
     /**
      * Method returning the class name
diff --git a/lib/UserManagement/Add/Group/UserManagementStructAddMembersToInternalGroup.php b/lib/UserManagement/Add/Group/UserManagementStructAddMembersToInternalGroup.php
index ef85169..436e8be 100644
--- a/lib/UserManagement/Add/Group/UserManagementStructAddMembersToInternalGroup.php
+++ b/lib/UserManagement/Add/Group/UserManagementStructAddMembersToInternalGroup.php
@@ -135,9 +135,9 @@ public function setMemberIds($_memberIds)
      * @param array $_array the exported values
      * @return UserManagementStructAddMembersToInternalGroup
      */
-    public static function __set_state(array $_array,$_className = __CLASS__)
+    public static function __set_state(array $_array)
     {
-        return parent::__set_state($_array,$_className);
+        return parent::__set_state($_array);
     }
     /**
      * Method returning the class name
diff --git a/lib/UserManagement/Array/Group/UserManagementStructArrayOfGroup.php b/lib/UserManagement/Array/Group/UserManagementStructArrayOfGroup.php
index 6dd1c6f..4cf144e 100644
--- a/lib/UserManagement/Array/Group/UserManagementStructArrayOfGroup.php
+++ b/lib/UserManagement/Array/Group/UserManagementStructArrayOfGroup.php
@@ -140,9 +140,9 @@ public function getAttributeName()
      * @param array $_array the exported values
      * @return UserManagementStructArrayOfGroup
      */
-    public static function __set_state(array $_array,$_className = __CLASS__)
+    public static function __set_state(array $_array)
     {
-        return parent::__set_state($_array,$_className);
+        return parent::__set_state($_array);
     }
     /**
      * Method returning the class name
diff --git a/lib/UserManagement/Array/Ofguid/UserManagementStructArrayOfguid.php b/lib/UserManagement/Array/Ofguid/UserManagementStructArrayOfguid.php
index 6c09bd5..a3db0ff 100644
--- a/lib/UserManagement/Array/Ofguid/UserManagementStructArrayOfguid.php
+++ b/lib/UserManagement/Array/Ofguid/UserManagementStructArrayOfguid.php
@@ -140,9 +140,9 @@ public function getAttributeName()
      * @param array $_array the exported values
      * @return UserManagementStructArrayOfguid
      */
-    public static function __set_state(array $_array,$_className = __CLASS__)
+    public static function __set_state(array $_array)
     {
-        return parent::__set_state($_array,$_className);
+        return parent::__set_state($_array);
     }
     /**
      * Method returning the class name
diff --git a/lib/UserManagement/Array/Ofstring/UserManagementStructArrayOfstring.php b/lib/UserManagement/Array/Ofstring/UserManagementStructArrayOfstring.php
index df4d53e..07d621c 100644
--- a/lib/UserManagement/Array/Ofstring/UserManagementStructArrayOfstring.php
+++ b/lib/UserManagement/Array/Ofstring/UserManagementStructArrayOfstring.php
@@ -140,9 +140,9 @@ public function getAttributeName()
      * @param array $_array the exported values
      * @return UserManagementStructArrayOfstring
      */
-    public static function __set_state(array $_array,$_className = __CLASS__)
+    public static function __set_state(array $_array)
     {
-        return parent::__set_state($_array,$_className);
+        return parent::__set_state($_array);
     }
     /**
      * Method returning the class name
diff --git a/lib/UserManagement/Array/User/UserManagementStructArrayOfUser.php b/lib/UserManagement/Array/User/UserManagementStructArrayOfUser.php
index 5cfadb8..6a1e345 100644
--- a/lib/UserManagement/Array/User/UserManagementStructArrayOfUser.php
+++ b/lib/UserManagement/Array/User/UserManagementStructArrayOfUser.php
@@ -140,9 +140,9 @@ public function getAttributeName()
      * @param array $_array the exported values
      * @return UserManagementStructArrayOfUser
      */
-    public static function __set_state(array $_array,$_className = __CLASS__)
+    public static function __set_state(array $_array)
     {
-        return parent::__set_state($_array,$_className);
+        return parent::__set_state($_array);
     }
     /**
      * Method returning the class name
diff --git a/lib/UserManagement/Authentication/Info/UserManagementStructAuthenticationInfo.php b/lib/UserManagement/Authentication/Info/UserManagementStructAuthenticationInfo.php
index fd68639..13e3604 100644
--- a/lib/UserManagement/Authentication/Info/UserManagementStructAuthenticationInfo.php
+++ b/lib/UserManagement/Authentication/Info/UserManagementStructAuthenticationInfo.php
@@ -135,9 +135,9 @@ public function setUserKey($_userKey)
      * @param array $_array the exported values
      * @return UserManagementStructAuthenticationInfo
      */
-    public static function __set_state(array $_array,$_className = __CLASS__)
+    public static function __set_state(array $_array)
     {
-        return parent::__set_state($_array,$_className);
+        return parent::__set_state($_array);
     }
     /**
      * Method returning the class name
diff --git a/lib/UserManagement/Create/Group/UserManagementStructCreateExternalGroup.php b/lib/UserManagement/Create/Group/UserManagementStructCreateExternalGroup.php
index 85acb92..0c47484 100644
--- a/lib/UserManagement/Create/Group/UserManagementStructCreateExternalGroup.php
+++ b/lib/UserManagement/Create/Group/UserManagementStructCreateExternalGroup.php
@@ -187,9 +187,9 @@ public function setMemberIds($_memberIds)
      * @param array $_array the exported values
      * @return UserManagementStructCreateExternalGroup
      */
-    public static function __set_state(array $_array,$_className = __CLASS__)
+    public static function __set_state(array $_array)
     {
-        return parent::__set_state($_array,$_className);
+        return parent::__set_state($_array);
     }
     /**
      * Method returning the class name
diff --git a/lib/UserManagement/Create/Group/UserManagementStructCreateInternalGroup.php b/lib/UserManagement/Create/Group/UserManagementStructCreateInternalGroup.php
index d5882df..01fddf2 100644
--- a/lib/UserManagement/Create/Group/UserManagementStructCreateInternalGroup.php
+++ b/lib/UserManagement/Create/Group/UserManagementStructCreateInternalGroup.php
@@ -135,9 +135,9 @@ public function setMemberIds($_memberIds)
      * @param array $_array the exported values
      * @return UserManagementStructCreateInternalGroup
      */
-    public static function __set_state(array $_array,$_className = __CLASS__)
+    public static function __set_state(array $_array)
     {
-        return parent::__set_state($_array,$_className);
+        return parent::__set_state($_array);
     }
     /**
      * Method returning the class name
diff --git a/lib/UserManagement/Create/Response/UserManagementStructCreateExternalGroupResponse.php b/lib/UserManagement/Create/Response/UserManagementStructCreateExternalGroupResponse.php
index 762f352..3aa5267 100644
--- a/lib/UserManagement/Create/Response/UserManagementStructCreateExternalGroupResponse.php
+++ b/lib/UserManagement/Create/Response/UserManagementStructCreateExternalGroupResponse.php
@@ -83,9 +83,9 @@ public function setCreateExternalGroupResult($_createExternalGroupResult)
      * @param array $_array the exported values
      * @return UserManagementStructCreateExternalGroupResponse
      */
-    public static function __set_state(array $_array,$_className = __CLASS__)
+    public static function __set_state(array $_array)
     {
-        return parent::__set_state($_array,$_className);
+        return parent::__set_state($_array);
     }
     /**
      * Method returning the class name
diff --git a/lib/UserManagement/Create/Response/UserManagementStructCreateInternalGroupResponse.php b/lib/UserManagement/Create/Response/UserManagementStructCreateInternalGroupResponse.php
index 6987ae8..d0c12a1 100644
--- a/lib/UserManagement/Create/Response/UserManagementStructCreateInternalGroupResponse.php
+++ b/lib/UserManagement/Create/Response/UserManagementStructCreateInternalGroupResponse.php
@@ -83,9 +83,9 @@ public function setCreateInternalGroupResult($_createInternalGroupResult)
      * @param array $_array the exported values
      * @return UserManagementStructCreateInternalGroupResponse
      */
-    public static function __set_state(array $_array,$_className = __CLASS__)
+    public static function __set_state(array $_array)
     {
-        return parent::__set_state($_array,$_className);
+        return parent::__set_state($_array);
     }
     /**
      * Method returning the class name
diff --git a/lib/UserManagement/Create/Response/UserManagementStructCreateUserResponse.php b/lib/UserManagement/Create/Response/UserManagementStructCreateUserResponse.php
index d7962b6..3b72e25 100644
--- a/lib/UserManagement/Create/Response/UserManagementStructCreateUserResponse.php
+++ b/lib/UserManagement/Create/Response/UserManagementStructCreateUserResponse.php
@@ -83,9 +83,9 @@ public function setCreateUserResult($_createUserResult)
      * @param array $_array the exported values
      * @return UserManagementStructCreateUserResponse
      */
-    public static function __set_state(array $_array,$_className = __CLASS__)
+    public static function __set_state(array $_array)
     {
-        return parent::__set_state($_array,$_className);
+        return parent::__set_state($_array);
     }
     /**
      * Method returning the class name
diff --git a/lib/UserManagement/Create/Response/UserManagementStructCreateUsersResponse.php b/lib/UserManagement/Create/Response/UserManagementStructCreateUsersResponse.php
index 344a583..49b14e2 100644
--- a/lib/UserManagement/Create/Response/UserManagementStructCreateUsersResponse.php
+++ b/lib/UserManagement/Create/Response/UserManagementStructCreateUsersResponse.php
@@ -83,9 +83,9 @@ public function setCreateUsersResult($_createUsersResult)
      * @param array $_array the exported values
      * @return UserManagementStructCreateUsersResponse
      */
-    public static function __set_state(array $_array,$_className = __CLASS__)
+    public static function __set_state(array $_array)
     {
-        return parent::__set_state($_array,$_className);
+        return parent::__set_state($_array);
     }
     /**
      * Method returning the class name
diff --git a/lib/UserManagement/Create/User/UserManagementStructCreateUser.php b/lib/UserManagement/Create/User/UserManagementStructCreateUser.php
index 7003634..1d52346 100644
--- a/lib/UserManagement/Create/User/UserManagementStructCreateUser.php
+++ b/lib/UserManagement/Create/User/UserManagementStructCreateUser.php
@@ -135,9 +135,9 @@ public function setInitialPassword($_initialPassword)
      * @param array $_array the exported values
      * @return UserManagementStructCreateUser
      */
-    public static function __set_state(array $_array,$_className = __CLASS__)
+    public static function __set_state(array $_array)
     {
-        return parent::__set_state($_array,$_className);
+        return parent::__set_state($_array);
     }
     /**
      * Method returning the class name
diff --git a/lib/UserManagement/Create/Users/UserManagementStructCreateUsers.php b/lib/UserManagement/Create/Users/UserManagementStructCreateUsers.php
index 21ecd19..3bad320 100644
--- a/lib/UserManagement/Create/Users/UserManagementStructCreateUsers.php
+++ b/lib/UserManagement/Create/Users/UserManagementStructCreateUsers.php
@@ -109,9 +109,9 @@ public function setUsers($_users)
      * @param array $_array the exported values
      * @return UserManagementStructCreateUsers
      */
-    public static function __set_state(array $_array,$_className = __CLASS__)
+    public static function __set_state(array $_array)
     {
-        return parent::__set_state($_array,$_className);
+        return parent::__set_state($_array);
     }
     /**
      * Method returning the class name
diff --git a/lib/UserManagement/Delete/Group/UserManagementStructDeleteGroup.php b/lib/UserManagement/Delete/Group/UserManagementStructDeleteGroup.php
index df5cabc..b290074 100644
--- a/lib/UserManagement/Delete/Group/UserManagementStructDeleteGroup.php
+++ b/lib/UserManagement/Delete/Group/UserManagementStructDeleteGroup.php
@@ -109,9 +109,9 @@ public function setGroupId($_groupId)
      * @param array $_array the exported values
      * @return UserManagementStructDeleteGroup
      */
-    public static function __set_state(array $_array,$_className = __CLASS__)
+    public static function __set_state(array $_array)
     {
-        return parent::__set_state($_array,$_className);
+        return parent::__set_state($_array);
     }
     /**
      * Method returning the class name
diff --git a/lib/UserManagement/Delete/Users/UserManagementStructDeleteUsers.php b/lib/UserManagement/Delete/Users/UserManagementStructDeleteUsers.php
index cfc8665..d35e3a1 100644
--- a/lib/UserManagement/Delete/Users/UserManagementStructDeleteUsers.php
+++ b/lib/UserManagement/Delete/Users/UserManagementStructDeleteUsers.php
@@ -109,9 +109,9 @@ public function setUserIds($_userIds)
      * @param array $_array the exported values
      * @return UserManagementStructDeleteUsers
      */
-    public static function __set_state(array $_array,$_className = __CLASS__)
+    public static function __set_state(array $_array)
     {
-        return parent::__set_state($_array,$_className);
+        return parent::__set_state($_array);
     }
     /**
      * Method returning the class name
diff --git a/lib/UserManagement/Get/Group/UserManagementStructGetGroup.php b/lib/UserManagement/Get/Group/UserManagementStructGetGroup.php
index 3c4ed42..d7580a5 100644
--- a/lib/UserManagement/Get/Group/UserManagementStructGetGroup.php
+++ b/lib/UserManagement/Get/Group/UserManagementStructGetGroup.php
@@ -109,9 +109,9 @@ public function setGroupId($_groupId)
      * @param array $_array the exported values
      * @return UserManagementStructGetGroup
      */
-    public static function __set_state(array $_array,$_className = __CLASS__)
+    public static function __set_state(array $_array)
     {
-        return parent::__set_state($_array,$_className);
+        return parent::__set_state($_array);
     }
     /**
      * Method returning the class name
diff --git a/lib/UserManagement/Get/Group/UserManagementStructGetUsersInGroup.php b/lib/UserManagement/Get/Group/UserManagementStructGetUsersInGroup.php
index 4351433..e04de0c 100644
--- a/lib/UserManagement/Get/Group/UserManagementStructGetUsersInGroup.php
+++ b/lib/UserManagement/Get/Group/UserManagementStructGetUsersInGroup.php
@@ -109,9 +109,9 @@ public function setGroupId($_groupId)
      * @param array $_array the exported values
      * @return UserManagementStructGetUsersInGroup
      */
-    public static function __set_state(array $_array,$_className = __CLASS__)
+    public static function __set_state(array $_array)
     {
-        return parent::__set_state($_array,$_className);
+        return parent::__set_state($_array);
     }
     /**
      * Method returning the class name
diff --git a/lib/UserManagement/Get/Key/UserManagementStructGetUserByKey.php b/lib/UserManagement/Get/Key/UserManagementStructGetUserByKey.php
index 2ec368e..20af762 100644
--- a/lib/UserManagement/Get/Key/UserManagementStructGetUserByKey.php
+++ b/lib/UserManagement/Get/Key/UserManagementStructGetUserByKey.php
@@ -109,9 +109,9 @@ public function setUserKey($_userKey)
      * @param array $_array the exported values
      * @return UserManagementStructGetUserByKey
      */
-    public static function __set_state(array $_array,$_className = __CLASS__)
+    public static function __set_state(array $_array)
     {
-        return parent::__set_state($_array,$_className);
+        return parent::__set_state($_array);
     }
     /**
      * Method returning the class name
diff --git a/lib/UserManagement/Get/Name/UserManagementStructGetGroupsByName.php b/lib/UserManagement/Get/Name/UserManagementStructGetGroupsByName.php
index 89a949a..f3f5c0b 100644
--- a/lib/UserManagement/Get/Name/UserManagementStructGetGroupsByName.php
+++ b/lib/UserManagement/Get/Name/UserManagementStructGetGroupsByName.php
@@ -109,9 +109,9 @@ public function setGroupName($_groupName)
      * @param array $_array the exported values
      * @return UserManagementStructGetGroupsByName
      */
-    public static function __set_state(array $_array,$_className = __CLASS__)
+    public static function __set_state(array $_array)
     {
-        return parent::__set_state($_array,$_className);
+        return parent::__set_state($_array);
     }
     /**
      * Method returning the class name
diff --git a/lib/UserManagement/Get/Public/UserManagementStructGetGroupIsPublic.php b/lib/UserManagement/Get/Public/UserManagementStructGetGroupIsPublic.php
index 2e44cee..5a79f4b 100644
--- a/lib/UserManagement/Get/Public/UserManagementStructGetGroupIsPublic.php
+++ b/lib/UserManagement/Get/Public/UserManagementStructGetGroupIsPublic.php
@@ -109,9 +109,9 @@ public function setGroupId($_groupId)
      * @param array $_array the exported values
      * @return UserManagementStructGetGroupIsPublic
      */
-    public static function __set_state(array $_array,$_className = __CLASS__)
+    public static function __set_state(array $_array)
     {
-        return parent::__set_state($_array,$_className);
+        return parent::__set_state($_array);
     }
     /**
      * Method returning the class name
diff --git a/lib/UserManagement/Get/Response/UserManagementStructGetGroupIsPublicResponse.php b/lib/UserManagement/Get/Response/UserManagementStructGetGroupIsPublicResponse.php
index 2685713..9eee87e 100644
--- a/lib/UserManagement/Get/Response/UserManagementStructGetGroupIsPublicResponse.php
+++ b/lib/UserManagement/Get/Response/UserManagementStructGetGroupIsPublicResponse.php
@@ -82,9 +82,9 @@ public function setGetGroupIsPublicResult($_getGroupIsPublicResult)
      * @param array $_array the exported values
      * @return UserManagementStructGetGroupIsPublicResponse
      */
-    public static function __set_state(array $_array,$_className = __CLASS__)
+    public static function __set_state(array $_array)
     {
-        return parent::__set_state($_array,$_className);
+        return parent::__set_state($_array);
     }
     /**
      * Method returning the class name
diff --git a/lib/UserManagement/Get/Response/UserManagementStructGetGroupResponse.php b/lib/UserManagement/Get/Response/UserManagementStructGetGroupResponse.php
index d60b70d..0f2f017 100644
--- a/lib/UserManagement/Get/Response/UserManagementStructGetGroupResponse.php
+++ b/lib/UserManagement/Get/Response/UserManagementStructGetGroupResponse.php
@@ -83,9 +83,9 @@ public function setGetGroupResult($_getGroupResult)
      * @param array $_array the exported values
      * @return UserManagementStructGetGroupResponse
      */
-    public static function __set_state(array $_array,$_className = __CLASS__)
+    public static function __set_state(array $_array)
     {
-        return parent::__set_state($_array,$_className);
+        return parent::__set_state($_array);
     }
     /**
      * Method returning the class name
diff --git a/lib/UserManagement/Get/Response/UserManagementStructGetGroupsByNameResponse.php b/lib/UserManagement/Get/Response/UserManagementStructGetGroupsByNameResponse.php
index cc6f5d9..cc536b9 100644
--- a/lib/UserManagement/Get/Response/UserManagementStructGetGroupsByNameResponse.php
+++ b/lib/UserManagement/Get/Response/UserManagementStructGetGroupsByNameResponse.php
@@ -83,9 +83,9 @@ public function setGetGroupsByNameResult($_getGroupsByNameResult)
      * @param array $_array the exported values
      * @return UserManagementStructGetGroupsByNameResponse
      */
-    public static function __set_state(array $_array,$_className = __CLASS__)
+    public static function __set_state(array $_array)
     {
-        return parent::__set_state($_array,$_className);
+        return parent::__set_state($_array);
     }
     /**
      * Method returning the class name
diff --git a/lib/UserManagement/Get/Response/UserManagementStructGetUserByKeyResponse.php b/lib/UserManagement/Get/Response/UserManagementStructGetUserByKeyResponse.php
index 63276fe..3abe31f 100644
--- a/lib/UserManagement/Get/Response/UserManagementStructGetUserByKeyResponse.php
+++ b/lib/UserManagement/Get/Response/UserManagementStructGetUserByKeyResponse.php
@@ -83,9 +83,9 @@ public function setGetUserByKeyResult($_getUserByKeyResult)
      * @param array $_array the exported values
      * @return UserManagementStructGetUserByKeyResponse
      */
-    public static function __set_state(array $_array,$_className = __CLASS__)
+    public static function __set_state(array $_array)
     {
-        return parent::__set_state($_array,$_className);
+        return parent::__set_state($_array);
     }
     /**
      * Method returning the class name
diff --git a/lib/UserManagement/Get/Response/UserManagementStructGetUsersInGroupResponse.php b/lib/UserManagement/Get/Response/UserManagementStructGetUsersInGroupResponse.php
index 72a653d..945bdbf 100644
--- a/lib/UserManagement/Get/Response/UserManagementStructGetUsersInGroupResponse.php
+++ b/lib/UserManagement/Get/Response/UserManagementStructGetUsersInGroupResponse.php
@@ -83,9 +83,9 @@ public function setGetUsersInGroupResult($_getUsersInGroupResult)
      * @param array $_array the exported values
      * @return UserManagementStructGetUsersInGroupResponse
      */
-    public static function __set_state(array $_array,$_className = __CLASS__)
+    public static function __set_state(array $_array)
     {
-        return parent::__set_state($_array,$_className);
+        return parent::__set_state($_array);
     }
     /**
      * Method returning the class name
diff --git a/lib/UserManagement/Get/Response/UserManagementStructGetUsersResponse.php b/lib/UserManagement/Get/Response/UserManagementStructGetUsersResponse.php
index 9591003..47cdd90 100644
--- a/lib/UserManagement/Get/Response/UserManagementStructGetUsersResponse.php
+++ b/lib/UserManagement/Get/Response/UserManagementStructGetUsersResponse.php
@@ -83,9 +83,9 @@ public function setGetUsersResult($_getUsersResult)
      * @param array $_array the exported values
      * @return UserManagementStructGetUsersResponse
      */
-    public static function __set_state(array $_array,$_className = __CLASS__)
+    public static function __set_state(array $_array)
     {
-        return parent::__set_state($_array,$_className);
+        return parent::__set_state($_array);
     }
     /**
      * Method returning the class name
diff --git a/lib/UserManagement/Get/Users/UserManagementStructGetUsers.php b/lib/UserManagement/Get/Users/UserManagementStructGetUsers.php
index e99c8ed..3a599b0 100644
--- a/lib/UserManagement/Get/Users/UserManagementStructGetUsers.php
+++ b/lib/UserManagement/Get/Users/UserManagementStructGetUsers.php
@@ -109,9 +109,9 @@ public function setUserIds($_userIds)
      * @param array $_array the exported values
      * @return UserManagementStructGetUsers
      */
-    public static function __set_state(array $_array,$_className = __CLASS__)
+    public static function __set_state(array $_array)
     {
-        return parent::__set_state($_array,$_className);
+        return parent::__set_state($_array);
     }
     /**
      * Method returning the class name
diff --git a/lib/UserManagement/Group/UserManagementStructGroup.php b/lib/UserManagement/Group/UserManagementStructGroup.php
index d88fcd9..299d40c 100644
--- a/lib/UserManagement/Group/UserManagementStructGroup.php
+++ b/lib/UserManagement/Group/UserManagementStructGroup.php
@@ -221,9 +221,9 @@ public function setSystemRole($_systemRole)
      * @param array $_array the exported values
      * @return UserManagementStructGroup
      */
-    public static function __set_state(array $_array,$_className = __CLASS__)
+    public static function __set_state(array $_array)
     {
-        return parent::__set_state($_array,$_className);
+        return parent::__set_state($_array);
     }
     /**
      * Method returning the class name
diff --git a/lib/UserManagement/List/Groups/UserManagementStructListGroups.php b/lib/UserManagement/List/Groups/UserManagementStructListGroups.php
index a810868..5638214 100644
--- a/lib/UserManagement/List/Groups/UserManagementStructListGroups.php
+++ b/lib/UserManagement/List/Groups/UserManagementStructListGroups.php
@@ -109,9 +109,9 @@ public function setPagination($_pagination)
      * @param array $_array the exported values
      * @return UserManagementStructListGroups
      */
-    public static function __set_state(array $_array,$_className = __CLASS__)
+    public static function __set_state(array $_array)
     {
-        return parent::__set_state($_array,$_className);
+        return parent::__set_state($_array);
     }
     /**
      * Method returning the class name
diff --git a/lib/UserManagement/List/Request/UserManagementStructListUsersRequest.php b/lib/UserManagement/List/Request/UserManagementStructListUsersRequest.php
index 7b55ce1..4ad9320 100644
--- a/lib/UserManagement/List/Request/UserManagementStructListUsersRequest.php
+++ b/lib/UserManagement/List/Request/UserManagementStructListUsersRequest.php
@@ -138,9 +138,9 @@ public function setSortIncreasing($_sortIncreasing)
      * @param array $_array the exported values
      * @return UserManagementStructListUsersRequest
      */
-    public static function __set_state(array $_array,$_className = __CLASS__)
+    public static function __set_state(array $_array)
     {
-        return parent::__set_state($_array,$_className);
+        return parent::__set_state($_array);
     }
     /**
      * Method returning the class name
diff --git a/lib/UserManagement/List/Response/UserManagementStructListGroupsResponse.php b/lib/UserManagement/List/Response/UserManagementStructListGroupsResponse.php
index 27a3eba..577a0fe 100644
--- a/lib/UserManagement/List/Response/UserManagementStructListGroupsResponse.php
+++ b/lib/UserManagement/List/Response/UserManagementStructListGroupsResponse.php
@@ -135,9 +135,9 @@ public function setListGroupsResult($_listGroupsResult)
      * @param array $_array the exported values
      * @return UserManagementStructListGroupsResponse
      */
-    public static function __set_state(array $_array,$_className = __CLASS__)
+    public static function __set_state(array $_array)
     {
-        return parent::__set_state($_array,$_className);
+        return parent::__set_state($_array);
     }
     /**
      * Method returning the class name
diff --git a/lib/UserManagement/List/Response/UserManagementStructListUsersResponse.php b/lib/UserManagement/List/Response/UserManagementStructListUsersResponse.php
index c454971..645c5b1 100644
--- a/lib/UserManagement/List/Response/UserManagementStructListUsersResponse.php
+++ b/lib/UserManagement/List/Response/UserManagementStructListUsersResponse.php
@@ -135,9 +135,9 @@ public function setListUsersResult($_listUsersResult)
      * @param array $_array the exported values
      * @return UserManagementStructListUsersResponse
      */
-    public static function __set_state(array $_array,$_className = __CLASS__)
+    public static function __set_state(array $_array)
     {
-        return parent::__set_state($_array,$_className);
+        return parent::__set_state($_array);
     }
     /**
      * Method returning the class name
diff --git a/lib/UserManagement/List/Users/UserManagementStructListUsers.php b/lib/UserManagement/List/Users/UserManagementStructListUsers.php
index cebd387..d03677b 100644
--- a/lib/UserManagement/List/Users/UserManagementStructListUsers.php
+++ b/lib/UserManagement/List/Users/UserManagementStructListUsers.php
@@ -135,9 +135,9 @@ public function setSearchQuery($_searchQuery)
      * @param array $_array the exported values
      * @return UserManagementStructListUsers
      */
-    public static function __set_state(array $_array,$_className = __CLASS__)
+    public static function __set_state(array $_array)
     {
-        return parent::__set_state($_array,$_className);
+        return parent::__set_state($_array);
     }
     /**
      * Method returning the class name
diff --git a/lib/UserManagement/Pagination/UserManagementStructPagination.php b/lib/UserManagement/Pagination/UserManagementStructPagination.php
index 953c477..cca8531 100644
--- a/lib/UserManagement/Pagination/UserManagementStructPagination.php
+++ b/lib/UserManagement/Pagination/UserManagementStructPagination.php
@@ -107,9 +107,9 @@ public function setPageNumber($_pageNumber)
      * @param array $_array the exported values
      * @return UserManagementStructPagination
      */
-    public static function __set_state(array $_array,$_className = __CLASS__)
+    public static function __set_state(array $_array)
     {
-        return parent::__set_state($_array,$_className);
+        return parent::__set_state($_array);
     }
     /**
      * Method returning the class name
diff --git a/lib/UserManagement/Remove/Group/UserManagementStructRemoveMembersFromExternalGroup.php b/lib/UserManagement/Remove/Group/UserManagementStructRemoveMembersFromExternalGroup.php
index bf34360..449b035 100644
--- a/lib/UserManagement/Remove/Group/UserManagementStructRemoveMembersFromExternalGroup.php
+++ b/lib/UserManagement/Remove/Group/UserManagementStructRemoveMembersFromExternalGroup.php
@@ -161,9 +161,9 @@ public function setMemberIds($_memberIds)
      * @param array $_array the exported values
      * @return UserManagementStructRemoveMembersFromExternalGroup
      */
-    public static function __set_state(array $_array,$_className = __CLASS__)
+    public static function __set_state(array $_array)
     {
-        return parent::__set_state($_array,$_className);
+        return parent::__set_state($_array);
     }
     /**
      * Method returning the class name
diff --git a/lib/UserManagement/Remove/Group/UserManagementStructRemoveMembersFromInternalGroup.php b/lib/UserManagement/Remove/Group/UserManagementStructRemoveMembersFromInternalGroup.php
index 9d5cb24..76878d8 100644
--- a/lib/UserManagement/Remove/Group/UserManagementStructRemoveMembersFromInternalGroup.php
+++ b/lib/UserManagement/Remove/Group/UserManagementStructRemoveMembersFromInternalGroup.php
@@ -135,9 +135,9 @@ public function setMemberIds($_memberIds)
      * @param array $_array the exported values
      * @return UserManagementStructRemoveMembersFromInternalGroup
      */
-    public static function __set_state(array $_array,$_className = __CLASS__)
+    public static function __set_state(array $_array)
     {
-        return parent::__set_state($_array,$_className);
+        return parent::__set_state($_array);
     }
     /**
      * Method returning the class name
diff --git a/lib/UserManagement/Reset/Password/UserManagementStructResetPassword.php b/lib/UserManagement/Reset/Password/UserManagementStructResetPassword.php
index c2c3738..3f5ab76 100644
--- a/lib/UserManagement/Reset/Password/UserManagementStructResetPassword.php
+++ b/lib/UserManagement/Reset/Password/UserManagementStructResetPassword.php
@@ -109,9 +109,9 @@ public function setUserId($_userId)
      * @param array $_array the exported values
      * @return UserManagementStructResetPassword
      */
-    public static function __set_state(array $_array,$_className = __CLASS__)
+    public static function __set_state(array $_array)
     {
-        return parent::__set_state($_array,$_className);
+        return parent::__set_state($_array);
     }
     /**
      * Method returning the class name
diff --git a/lib/UserManagement/Set/Public/UserManagementStructSetGroupIsPublic.php b/lib/UserManagement/Set/Public/UserManagementStructSetGroupIsPublic.php
index 53615a1..ad96915 100644
--- a/lib/UserManagement/Set/Public/UserManagementStructSetGroupIsPublic.php
+++ b/lib/UserManagement/Set/Public/UserManagementStructSetGroupIsPublic.php
@@ -134,9 +134,9 @@ public function setIsPublic($_isPublic)
      * @param array $_array the exported values
      * @return UserManagementStructSetGroupIsPublic
      */
-    public static function __set_state(array $_array,$_className = __CLASS__)
+    public static function __set_state(array $_array)
     {
-        return parent::__set_state($_array,$_className);
+        return parent::__set_state($_array);
     }
     /**
      * Method returning the class name
diff --git a/lib/UserManagement/Set/Role/UserManagementStructSetSystemRole.php b/lib/UserManagement/Set/Role/UserManagementStructSetSystemRole.php
index 5eaa5ac..044c041 100644
--- a/lib/UserManagement/Set/Role/UserManagementStructSetSystemRole.php
+++ b/lib/UserManagement/Set/Role/UserManagementStructSetSystemRole.php
@@ -139,9 +139,9 @@ public function setRole($_role)
      * @param array $_array the exported values
      * @return UserManagementStructSetSystemRole
      */
-    public static function __set_state(array $_array,$_className = __CLASS__)
+    public static function __set_state(array $_array)
     {
-        return parent::__set_state($_array,$_className);
+        return parent::__set_state($_array);
     }
     /**
      * Method returning the class name
diff --git a/lib/UserManagement/Sync/User/UserManagementStructSyncExternalUser.php b/lib/UserManagement/Sync/User/UserManagementStructSyncExternalUser.php
index c6cec90..12eedc5 100644
--- a/lib/UserManagement/Sync/User/UserManagementStructSyncExternalUser.php
+++ b/lib/UserManagement/Sync/User/UserManagementStructSyncExternalUser.php
@@ -212,9 +212,9 @@ public function setExternalGroupIds($_externalGroupIds)
      * @param array $_array the exported values
      * @return UserManagementStructSyncExternalUser
      */
-    public static function __set_state(array $_array,$_className = __CLASS__)
+    public static function __set_state(array $_array)
     {
-        return parent::__set_state($_array,$_className);
+        return parent::__set_state($_array);
     }
     /**
      * Method returning the class name
diff --git a/lib/UserManagement/Unlock/Account/UserManagementStructUnlockAccount.php b/lib/UserManagement/Unlock/Account/UserManagementStructUnlockAccount.php
index 24b8da1..4be20e6 100644
--- a/lib/UserManagement/Unlock/Account/UserManagementStructUnlockAccount.php
+++ b/lib/UserManagement/Unlock/Account/UserManagementStructUnlockAccount.php
@@ -109,9 +109,9 @@ public function setUserId($_userId)
      * @param array $_array the exported values
      * @return UserManagementStructUnlockAccount
      */
-    public static function __set_state(array $_array,$_className = __CLASS__)
+    public static function __set_state(array $_array)
     {
-        return parent::__set_state($_array,$_className);
+        return parent::__set_state($_array);
     }
     /**
      * Method returning the class name
diff --git a/lib/UserManagement/Update/Bio/UserManagementStructUpdateUserBio.php b/lib/UserManagement/Update/Bio/UserManagementStructUpdateUserBio.php
index f62eed2..212a96f 100644
--- a/lib/UserManagement/Update/Bio/UserManagementStructUpdateUserBio.php
+++ b/lib/UserManagement/Update/Bio/UserManagementStructUpdateUserBio.php
@@ -135,9 +135,9 @@ public function setBio($_bio)
      * @param array $_array the exported values
      * @return UserManagementStructUpdateUserBio
      */
-    public static function __set_state(array $_array,$_className = __CLASS__)
+    public static function __set_state(array $_array)
     {
-        return parent::__set_state($_array,$_className);
+        return parent::__set_state($_array);
     }
     /**
      * Method returning the class name
diff --git a/lib/UserManagement/Update/Info/UserManagementStructUpdateContactInfo.php b/lib/UserManagement/Update/Info/UserManagementStructUpdateContactInfo.php
index 919950d..6f5a80a 100644
--- a/lib/UserManagement/Update/Info/UserManagementStructUpdateContactInfo.php
+++ b/lib/UserManagement/Update/Info/UserManagementStructUpdateContactInfo.php
@@ -212,9 +212,9 @@ public function setSendNotifications($_sendNotifications)
      * @param array $_array the exported values
      * @return UserManagementStructUpdateContactInfo
      */
-    public static function __set_state(array $_array,$_className = __CLASS__)
+    public static function __set_state(array $_array)
     {
-        return parent::__set_state($_array,$_className);
+        return parent::__set_state($_array);
     }
     /**
      * Method returning the class name
diff --git a/lib/UserManagement/Update/Password/UserManagementStructUpdatePassword.php b/lib/UserManagement/Update/Password/UserManagementStructUpdatePassword.php
index 00e9bd6..150d4ee 100644
--- a/lib/UserManagement/Update/Password/UserManagementStructUpdatePassword.php
+++ b/lib/UserManagement/Update/Password/UserManagementStructUpdatePassword.php
@@ -135,9 +135,9 @@ public function setNewPassword($_newPassword)
      * @param array $_array the exported values
      * @return UserManagementStructUpdatePassword
      */
-    public static function __set_state(array $_array,$_className = __CLASS__)
+    public static function __set_state(array $_array)
     {
-        return parent::__set_state($_array,$_className);
+        return parent::__set_state($_array);
     }
     /**
      * Method returning the class name
diff --git a/lib/UserManagement/User/UserManagementStructUser.php b/lib/UserManagement/User/UserManagementStructUser.php
index 7212b62..5740a6f 100644
--- a/lib/UserManagement/User/UserManagementStructUser.php
+++ b/lib/UserManagement/User/UserManagementStructUser.php
@@ -320,9 +320,9 @@ public function setUserSettingsUrl($_userSettingsUrl)
      * @param array $_array the exported values
      * @return UserManagementStructUser
      */
-    public static function __set_state(array $_array,$_className = __CLASS__)
+    public static function __set_state(array $_array)
     {
-        return parent::__set_state($_array,$_className);
+        return parent::__set_state($_array);
     }
     /**
      * Method returning the class name
diff --git a/lib/UserManagement/UserManagementWsdlClass.php b/lib/UserManagement/UserManagementWsdlClass.php
index ef4372a..9e42ee0 100644
--- a/lib/UserManagement/UserManagementWsdlClass.php
+++ b/lib/UserManagement/UserManagementWsdlClass.php
@@ -249,8 +249,9 @@ public function __construct($_arrayOfValues = array(),$_resetSoapClient = true)
      * @param string $_className optional (used by inherited classes in order to always call this method)
      * @return UserManagementWsdlClass|null
      */
-    public static function __set_state(array $_array,$_className = __CLASS__)
+    public static function __set_state(array $_array)
     {
+        $_className = __CLASS__;
         if(class_exists($_className))
         {
             $object = @new $_className();
diff --git a/lib/block_panopto_bulk_lib.php b/lib/block_panopto_bulk_lib.php
index f66dad4..679dd63 100644
--- a/lib/block_panopto_bulk_lib.php
+++ b/lib/block_panopto_bulk_lib.php
@@ -15,23 +15,25 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * main library functions for the panoptop block bulk operations. 
+ * Main library functions for the Panoptop block bulk operations.
+ *
  * Warning: These operations can work on many Panopto mappings for many Panopto servers at one time.
  *   Please make sure the user performing this work is an administrator on all Panopto servers to avoid
- *   an access headache.  
+ *   an access headache.
  *
  * @package block_panopto
  * @copyright  Panopto 2020
  * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
+
 /**
  * Update the progress for Panopto bulk operation.
  *
  * @param int $currentprogress the current progress that the bar needs to reflect.
  * @param int $totalitems the total number of items in the current step to be processed.
  * @param int $progressstep if set update the progress step to this value.
+ * @param int $taskstep which task step we are on currently.
  */
-
 function panopto_update_task_progress($currentprogress, $totalitems, $progressstep, $taskstep) {
     if (isset($taskstep) && !empty($taskstep)) {
         \panopto_data::print_log(get_string('bulk_task_new_step', 'block_panopto', $taskstep));
@@ -52,12 +54,12 @@ function panopto_update_task_progress($currentprogress, $totalitems, $progressst
 
 /**
  * Checks to see if we need to throttle the bulk operation and does so if needed
- * 
- * @var $numberprocessed the current number of folders processed.
+ *
+ * @param number $numberprocessed the current number of folders processed.
  */
 function panopto_handle_bulk_throttle($numberprocessed) {
     if ($numberprocessed > 0 && $numberprocessed % 50 == 0) {
-        // Put in a minor break between batches to not make API calls too quickly. 
+        // Put in a minor break between batches to not make API calls too quickly.
         sleep(10);
     }
 
@@ -67,35 +69,41 @@ function panopto_handle_bulk_throttle($numberprocessed) {
 /**
  * Display the access error in the case the working user does not have the correct Panopto permissions
  *
- * @var $targetuser the Panopto username for the current user (so the customer knows who to make an Admin)
- */ 
+ * @param string $targetuser the Panopto username for the current user (so the customer knows who to make an Admin)
+ */
 function panopto_bulk_display_access_error($targetuser) {
     if (!CLI_SCRIPT) {
         include('views/bulk_task_access_error.html.php');
     }
-    
+
     \panopto_data::print_log(
         get_string(
-            'bulk_task_access_error', 
-            'block_panopto', 
+            'bulk_task_access_error',
+            'block_panopto',
             $targetuser
         )
     );
 }
 
+/**
+ * Display progress bar for bulk update operation.
+ *
+ * @param int $percentdone % complete on the progress bar.
+ * @param string $steptype progress step status such as 'validating', 'processing', etc.
+ */
 function panopto_bulk_update_progress_bar($percentdone, $steptype) {
 
     $periodstring = '';
-    while(strlen($periodstring) < $percentdone % 4) {
+    while (strlen($periodstring) < $percentdone % 4) {
         $periodstring .= '.';
     }
-    // Javascript for updating the progress bar and information
-    $updatescriptstring = '<script language="javascript">' . 
-        'document.getElementById("panopto-progress-bar-' . $steptype . '").innerHTML="' . 
-        '<div style=\'width:'.$percentdone.'%;background-color: #228B22;z-index:0;\'>&nbsp;</div>' . 
-        '<span style=\'z-index: 1;position: absolute;top: 0px;transform: translateX(-50%);\'>' . 
+    // Javascript for updating the progress bar and information.
+    $updatescriptstring = '<script language="javascript">' .
+        'document.getElementById("panopto-progress-bar-' . $steptype . '").innerHTML="' .
+        '<div style=\'width:'.$percentdone.'%;background-color: #228B22;z-index:0;\'>&nbsp;</div>' .
+        '<span style=\'z-index: 1;position: absolute;top: 0px;transform: translateX(-50%);\'>' .
             $percentdone . '% done ' . $steptype . $periodstring .
-        '</span>"' . 
+        '</span>"' .
     '</script>';
 
     echo $updatescriptstring;
@@ -103,10 +111,10 @@ function panopto_bulk_update_progress_bar($percentdone, $steptype) {
 
 /**
  * This script will process all passed in folders using the passed in callback
- * 
- * @var $panoptocourseobjects array - all valid mappings ready to process
- * @var $bulktaskname string - the name of the bulk task we are performing on the mappings
- * @var $workercallback string - the name of the callback function we use to process a folder
+ *
+ * @param array $panoptocourseobjects all valid mappings ready to process
+ * @param string $bulktaskname the name of the bulk task we are performing on the mappings
+ * @param string $workercallback the name of the callback function we use to process a folder
  */
 function panopto_bulk_process_folders($panoptocourseobjects, $bulktaskname, $workercallback) {
     $currindex = 0;
@@ -125,12 +133,12 @@ function panopto_bulk_process_folders($panoptocourseobjects, $bulktaskname, $wor
 }
 
 /**
- * callback used to bulk reprovision all folders and imports
- * 
- * @var mappedfolder object the current folder we are provisioning
- */ 
+ * Callback used to bulk reprovision all folders and imports
+ *
+ * @param object $mappablecourse the current folder we are provisioning
+ */
 function panopto_bulk_reprovision_callback($mappablecourse) {
-    
+
     $provisioningdata = $mappablecourse->provisioninginfo;
     $provisioneddata = $mappablecourse->panopto->provision_course($provisioningdata, true);
 
@@ -140,8 +148,8 @@ function panopto_bulk_reprovision_callback($mappablecourse) {
     $mappablecourse->panopto->ensure_auth_manager();
     $activepanoptoserverversion = $mappablecourse->panopto->authmanager->get_server_version();
     $useccv2 = version_compare(
-        $activepanoptoserverversion, 
-        \panopto_data::$ccv2requiredpanoptoversion, 
+        $activepanoptoserverversion,
+        \panopto_data::$ccv2requiredpanoptoversion,
         '>='
     );
 
@@ -156,26 +164,26 @@ function panopto_bulk_reprovision_callback($mappablecourse) {
 }
 
 /**
- * callback used to bulk update all folder names to match course names
- * 
- * @var mappablecourse object the current folder we are provisioning
- */ 
+ * Callback used to bulk update all folder names to match course names
+ *
+ * @param object $mappablecourse the current folder we are provisioning
+ */
 function panopto_bulk_rename_callback($mappablecourse) {
-    // display the name information for the user
-    // provisioninginfo should still contain the original name.
+    // Display the name information for the user.
+    // Provisioninginfo should still contain the original name.
     $currentfoldernamecontainer = new stdClass;
     $currentfoldernamecontainer->oldname = $mappablecourse->provisioninginfo->fullname;
     $currentfoldernamecontainer->moodleid = $mappablecourse->panopto->moodlecourseid;
     if ($currentfoldernamecontainer->oldname != $mappablecourse->panopto->get_new_folder_name(null, null)) {
         if ($mappablecourse->panopto->update_folder_name()) {
 
-            // currentcoursename should get updated during the update_folder_name call.
+            // The currentcoursename should get updated during the update_folder_name call.
             $currentfoldernamecontainer->newname = $mappablecourse->panopto->currentcoursename;
 
             \panopto_data::print_log(
                 get_string('bulk_rename_single_success', 'block_panopto', $currentfoldernamecontainer)
             );
-            
+
             if (!CLI_SCRIPT) {
                 include('views/bulk_rename_single_success.html.php');
             }
@@ -188,7 +196,7 @@ function panopto_bulk_rename_callback($mappablecourse) {
             }
         }
     } else {
-        // currentcoursename should get updated during the update_folder_name call.
+        // The currentcoursename should get updated during the update_folder_name call.
         $currentfoldernamecontainer->newname = $mappablecourse->panopto->currentcoursename;
 
         \panopto_data::print_log(
@@ -203,13 +211,13 @@ function panopto_bulk_rename_callback($mappablecourse) {
 
 /**
  * Grabs every mapping existing in the Panopto FolderMap table and checks that the mapping is
- *   still in a good state (e.g. Folder Deleted in Panopto, Course in Moodle doesn't exist 
+ *   still in a good state (e.g. Folder Deleted in Panopto, Course in Moodle doesn't exist
  *   anymore, or any necessary DB fields still exist). Returns an array of Panopto mapping data
- *   for the mappings that are still in a good state or can be recovered by fresh provisining. 
- * 
- * @var $currentindex int the current folder row we are on
- * @var $skipimports bool whether or not to process imported folders. 
- */ 
+ *   for the mappings that are still in a good state or can be recovered by fresh provisining.
+ *
+ * @param array $params beginning index and number to process.
+ * @param bool $skipimports whether or not to process imported folders.
+ */
 function panopto_bulk_sanitize_and_get_mappings($params, $skipimports) {
     global $DB;
 
@@ -285,7 +293,7 @@ function panopto_bulk_sanitize_and_get_mappings($params, $skipimports) {
 
                 panopto_bulk_display_access_error($getunamepanopto->panopto_decorate_username($getunamepanopto->uname));
 
-                // If the user does not have access on even one of the folders return nothing. 
+                // If the user does not have access on even one of the folders return nothing.
                 return array();
             }
         } else {
@@ -302,8 +310,7 @@ function panopto_bulk_sanitize_and_get_mappings($params, $skipimports) {
 
             panopto_bulk_display_access_error($getunamepanopto->panopto_decorate_username($getunamepanopto->uname));
 
-
-            // If the user does not have access on even one of the folders return nothing. 
+            // If the user does not have access on even one of the folders return nothing.
             return array();
         } else {
             if (isset($oldpanoptocourse->provisioninginfo->couldnotfindmappedfolder) &&
@@ -312,7 +319,7 @@ function panopto_bulk_sanitize_and_get_mappings($params, $skipimports) {
                 // The true parameter moves the row to the old_foldermap instead of deleting it.
                 \panopto_data::delete_panopto_relation($oldcourse->moodleid, true);
 
-                //Recreate the default role mappings that were deleted by the above line.
+                // Recreate the default role mappings that were deleted by the above line.
                 $oldpanoptocourse->panopto->check_course_role_mappings();
 
                 // Imports SHOULD still work for this case, so continue to below code.
@@ -323,7 +330,6 @@ function panopto_bulk_sanitize_and_get_mappings($params, $skipimports) {
                 foreach ($courseimports as $courseimport) {
                     $importpanopto = new \panopto_data($courseimport);
 
-
                     $existingmoodlecourse = $DB->get_record('course', array('id' => $courseimport));
 
                     $moodlecourseexists = isset($existingmoodlecourse) && $existingmoodlecourse !== false;
@@ -331,14 +337,18 @@ function panopto_bulk_sanitize_and_get_mappings($params, $skipimports) {
                         isset($importpanopto->applicationkey) && !empty($importpanopto->applicationkey);
 
                     // Only perform the actions below if the import is in a valid state, otherwise remove it.
-                    if ($moodlecourseexists && $hasvalidpanoptodata) {  
+                    if ($moodlecourseexists && $hasvalidpanoptodata) {
                         $importpanoptofolder = $importpanopto->get_folders_by_id_no_sync();
 
-                        if ($importpanoptofolder == null || (isset($importpanoptofolder->notfound) && $importpanoptofolder->notfound == true)) {
-                            // In this case the folder was not found, not an access issue. Most likely the folder was deleted and this is an old entry.
+                        if ($importpanoptofolder == null ||
+                            (isset($importpanoptofolder->notfound) &&
+                            $importpanoptofolder->notfound == true)) {
+                            // In this case the folder was not found, not an access issue.
+                            // Most likely the folder was deleted and this is an old entry.
                             // Move the entry to the old_foldermap so user still has a reference.
                             \panopto_data::delete_panopto_relation($courseimport, true);
-                            // We can still continue on with the upgrade, assume this was an old entry that was deleted from Panopto side.
+                            // We can still continue on with the upgrade.
+                            // Assume this was an old entry that was deleted from Panopto side.
                         } else if (!empty($importpanoptofolder->errormessage)) {
 
                             // This case means the user failed to get the folder.
@@ -360,45 +370,49 @@ function panopto_bulk_sanitize_and_get_mappings($params, $skipimports) {
 }
 
 /**
- * Gets all existing mapped panopto folders, verifies the folders existand then renames them 
- *   to match their mapped course name
+ * Gets all existing mapped panopto folders, verifies the folders existand then renames them
+ * to match their mapped course name.
  *
- * @param string $params[1] - The index you would like to start with in the rename process.
- * @param string $params[2] - The number of folders you would like to work on this execution.
+ * @param array $params
+ * $params[1] - The index you would like to start with in the rename process.
+ * $params[2] - The number of folders you would like to work on this execution.
  */
 function panopto_rename_all_folders($params) {
-    // This can take a very long time if users have many folders
+    // This can take a very long time if users have many folders.
     core_php_time_limit::raise();
 
-    if(!CLI_SCRIPT) {
+    if (!CLI_SCRIPT) {
         include('views/bulk_task_progress_bar.html.php');
     }
 
     panopto_bulk_process_folders(
-        panopto_bulk_sanitize_and_get_mappings($params, true), 
-        get_string('bulk_rename_start_renaming', 'block_panopto'), 
+        panopto_bulk_sanitize_and_get_mappings($params, true),
+        get_string('bulk_rename_start_renaming', 'block_panopto'),
         'panopto_bulk_rename_callback'
     );
 }
 
 /**
  * This script will reprovision all existing Panopto folders associated with this Moodle site.
- * For users experiencing issues with large amounts of courses the following two parameters can be added to the CLI to batching purposes.
- * 
- * e.g. upgrade_all_folders.php 550 500 
- *   This line will start at folder 550 and will process/upgrade up to folder 1050
- * @param string $params[1] - The index you would like to start with in the upgrade process.
- * @param string $params[2] - The number of folders you would like to work on this execution.
+ * For users experiencing issues with large amounts of courses
+ * the following two parameters can be added to the CLI to batching purposes.
+ *
+ * e.g. upgrade_all_folders.php 550 500
+ * This line will start at folder 550 and will process/upgrade up to folder 1050
+ *
+ * @param array $params
+ * $params[1] - The index you would like to start with in the upgrade process.
+ * $params[2] - The number of folders you would like to work on this execution.
  */
 function panopto_upgrade_all_folders($params) {
-    // This can take a very long time if users have many folders
+    // This can take a very long time if users have many folders.
     core_php_time_limit::raise();
 
     if (!CLI_SCRIPT) {
         include('views/bulk_task_progress_bar.html.php');
     }
 
-    // we do not want to skip imports when bulk reprovisioning all folders. 
+    // We do not want to skip imports when bulk reprovisioning all folders.
     panopto_bulk_process_folders(
         panopto_bulk_sanitize_and_get_mappings($params, false),
         get_string('bulk_reprovision_begin_reprovision', 'block_panopto'),
diff --git a/lib/block_panopto_lib.php b/lib/block_panopto_lib.php
index 95c7977..54cc942 100644
--- a/lib/block_panopto_lib.php
+++ b/lib/block_panopto_lib.php
@@ -15,7 +15,7 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * main library functions for the panoptop block
+ * Main library functions for the Panopto block
  *
  * @package block_panopto
  * @copyright  Panopto 2009 - 2016 /With contributions from Spenser Jones (sjones@ambrose.edu)
@@ -29,7 +29,6 @@
  *
  * @param string $alertmessage - the message the user is supposed to see.
  */
-
 function panopto_alert_user($alertmessage) {
     echo '<script language="javascript">';
     echo 'alert("' . $alertmessage . '")';
@@ -98,14 +97,14 @@ function panopto_validate_auth_code($payload, $authcode) {
 }
 
 /**
- * takes an api url, then checks the Panopto config for proxy settings, and returns the relevant serviceparams object.
+ * Takes an api url, then checks the Panopto config for proxy settings, and returns the relevant serviceparams object.
  *
- * @param string apiurl
+ * @param string $apiurl
  */
 function panopto_generate_wsdl_service_params($apiurl) {
     $serviceparams = array('wsdl_url' => $apiurl);
 
-    // Check to see if the user set any proxy options
+    // Check to see if the user set any proxy options.
     $proxyhost = get_config('block_panopto', 'wsdl_proxy_host');
     $proxyport = get_config('block_panopto', 'wsdl_proxy_port');
 
@@ -123,6 +122,10 @@ function panopto_generate_wsdl_service_params($apiurl) {
     return $serviceparams;
 }
 
+/**
+ * Get configured Panopto servers.
+ *
+ */
 function panopto_get_configured_panopto_servers() {
 
     $numservers = get_config('block_panopto', 'server_number');
@@ -168,7 +171,7 @@ function panopto_get_target_panopto_server() {
             $thisappkey = get_config('block_panopto', 'application_key' . $serverwalker);
             $hasvaliddata = isset($thisappkey) && !empty($thisappkey);
 
-            // If we have valid data for the server then try to ensure the category branch
+            // If we have valid data for the server then try to ensure the category branch.
             if ($hasvaliddata) {
                 $ret = new stdClass();
                 $ret->name = $thisservername;
@@ -200,7 +203,7 @@ function panopto_get_valid_panopto_servers() {
         $thisappkey = get_config('block_panopto', 'application_key' . $serverwalker);
         $hasvaliddata = isset($thisappkey) && !empty($thisappkey);
 
-        // If we have valid data for the server then try to ensure the category branch
+        // If we have valid data for the server then try to ensure the category branch.
         if ($hasvaliddata) {
 
             $targetserver = new stdClass();
@@ -213,7 +216,7 @@ function panopto_get_valid_panopto_servers() {
 }
 
 /**
- *  Retrieve the app key for the target panopto server
+ * Retrieve the app key for the target panopto server.
  *
  * @param string $panoptoservername the server we are trying to get the application key for
  */
@@ -235,7 +238,7 @@ function panopto_get_app_key($panoptoservername) {
             return $thisappkey;
         }
     }
-    
+
     return null;
 }
 
@@ -275,6 +278,10 @@ function panopto_instantiate_session_soap_client($username, $servername, $applic
 /**
  * Used to instantiate a soap client for calling Panopto's iAuth service.
  * Should be called only the first time an  auth soap client is needed for an instance.
+ *
+ * @param string $username the name of the current user
+ * @param string $servername the name of the active server
+ * @param string $applicationkey the key need for the user to be authenticated
  */
 function panopto_instantiate_auth_soap_client($username, $servername, $applicationkey) {
     // Compute web service credentials for given user.
@@ -300,16 +307,16 @@ function panopto_is_string_empty($name) {
  * @param string $guidstring the uid being tested in string format.
  */
 function panopto_is_guid_empty($guidstring) {
-    // Assuming the guid is valid
-    $retVal = false;
+    // Assuming the guid is valid.
+    $retval = false;
     $val = array_sum(explode("-", $guidstring));
 
     if ($val == 0) {
-        // Guid is empty
-        $retVal = true;
+        // Guid is empty.
+        $retval = true;
     }
 
-    return $retVal;
+    return $retval;
 }
 
 /**
@@ -318,31 +325,37 @@ function panopto_is_guid_empty($guidstring) {
  * @param string $userinfostring information to check
  */
 function panopto_user_info_valid($userinfostring) {
-    // Assuming the guid is valid
-    $retVal = true;
+    // Assuming the guid is valid.
+    $retval = true;
 
     if (strcmp($userinfostring, '--Deleted--') === 0) {
-        // Guid is empty
-        $retVal = false;
+        // Guid is empty.
+        $retval = false;
     }
 
-    return $retVal;
+    return $retval;
 }
 
+/**
+ * Get all roles for context and context level
+ *
+ * @param string $targetcontext target context
+ */
 function panopto_get_all_roles_at_context_and_contextlevel($targetcontext) {
     global $DB;
 
-    $sql = "SELECT r.*, rn.name AS contextalias
-        FROM {role} r
-        INNER JOIN {role_context_levels} rcl ON (rcl.contextlevel = :targetcontextlevel AND rcl.roleid = r.id)
-        LEFT JOIN {role_names} rn ON (rn.contextid = :targetcontext AND rn.roleid = r.id)
-        ORDER BY r.sortorder ASC";
-    return $DB->get_records_sql($sql, array('targetcontext'=>$targetcontext->id, 'targetcontextlevel'=>$targetcontext->contextlevel));
+    $sql = "SELECT r.*, rn.name AS contextalias " .
+        "FROM {role} r " .
+        "INNER JOIN {role_context_levels} rcl ON (rcl.contextlevel = :targetcontextlevel AND rcl.roleid = r.id) " .
+        "LEFT JOIN {role_names} rn ON (rn.contextid = :targetcontext AND rn.roleid = r.id) " .
+        "ORDER BY r.sortorder ASC";
+    return $DB->get_records_sql($sql,
+        array('targetcontext' => $targetcontext->id, 'targetcontextlevel' => $targetcontext->contextlevel));
 }
 
 /**
- * Unsets all system publishers that are not currently mapped 
- *  and maps all roles that are currently set as publishers to have the proper capability
+ * Unsets all system publishers that are not currently mapped
+ *  and maps all roles that are currently set as publishers to have the proper capability.
  */
 function panopto_update_system_publishers() {
     global $DB;
@@ -353,8 +366,8 @@ function panopto_update_system_publishers() {
     $publishersystemroles = explode(',', $publisherrolesstring);
     $publisherprocessed = false;
 
-    // Remove the system publisher capability from all old publishers. 
-    foreach($systemrolearray as $possiblesystempublisher) {
+    // Remove the system publisher capability from all old publishers.
+    foreach ($systemrolearray as $possiblesystempublisher) {
         $targetname = !empty($possiblesystempublisher->name) ? $possiblesystempublisher->name : $possiblesystempublisher->shortname;
         if (!in_array($targetname, $publishersystemroles)) {
             $publisherprocessed = true;
@@ -364,8 +377,8 @@ function panopto_update_system_publishers() {
 
     // Build and process new/old changes to capabilities to roles and capabilities.
     $publisherprocessed = \panopto_data::build_and_assign_context_capability_to_roles(
-        $systemcontext, 
-        $publishersystemroles, 
+        $systemcontext,
+        $publishersystemroles,
         $capability
     ) || $publisherprocessed;
 
diff --git a/lib/cli/build_category_structure_cli.php b/lib/cli/build_category_structure_cli.php
index a19d2e8..fb573c7 100644
--- a/lib/cli/build_category_structure_cli.php
+++ b/lib/cli/build_category_structure_cli.php
@@ -15,15 +15,16 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * This logic will iterate through all leaf categories in Moodle and build a matching folder branch on Panopto. 
- *  After all branches are ensured then Panopto should have a folder structure that matches the Moodle category structure.
+ * This logic will iterate through all leaf categories in Moodle and build a matching folder branch on Panopto.
+ *
+ * After all branches are ensured then Panopto should have a folder structure that matches the Moodle category structure.
  *
  * @package block_panopto
  * @copyright  Panopto 2009 - 2017 with contributions from Hittesh Ahuja
  * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
-// Do not require MOODLE_INTERNAL definition since this is a CLI file. 
+// Do not require MOODLE_INTERNAL definition since this is a CLI file.
 
 define('CLI_SCRIPT', true);
 
@@ -45,14 +46,13 @@
 \core\session\manager::set_user(get_admin());
 cli_heading(get_string('cli_heading_build_category_structure', 'block_panopto'));
 
-
-
 /**
- * This CLI script will build the Moodle category structure on the target Panopto site. 
- * This will not sync existing folders to that new category structure. 
+ * This CLI script will build the Moodle category structure on the target Panopto site.
+ * This will not sync existing folders to that new category structure.
  *
- * @param string $params[1] - the panopto server the user is trying to use this script with. e.g. "example.hosted.panopto.com"
- * @param string $params[2] - the application key associated with the Moodle IDP on th target panopto server.
+ * @param array $params
+ * $params[1] - the panopto server the user is trying to use this script with. e.g. "example.hosted.panopto.com"
+ * $params[2] - the application key associated with the Moodle IDP on th target panopto server.
  */
 function build_panopto_category_structure($params) {
     if (!isset($params[1]) || !isset($params[2])) {
diff --git a/lib/cli/remove_all_panopto_adhoc_tasks.php b/lib/cli/remove_all_panopto_adhoc_tasks.php
index 259165f..d94b730 100644
--- a/lib/cli/remove_all_panopto_adhoc_tasks.php
+++ b/lib/cli/remove_all_panopto_adhoc_tasks.php
@@ -22,7 +22,7 @@
  * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
-// Do not require MOODLE_INTERNAL definition since this is a CLI file. 
+// Do not require MOODLE_INTERNAL definition since this is a CLI file.
 
 define('CLI_SCRIPT', true);
 
@@ -41,8 +41,11 @@
     die;
 }
 \core\session\manager::set_user(get_admin());
-cli_heading(get_string('bulk_remove_adhoc_task', 'block_panopto'));
+cli_heading(get_string('bulk_remove_all_adhoc_task', 'block_panopto'));
 
+/**
+ * Remove Panopto adhoc tasks.
+ */
 function remove_panopto_adhoc_tasks() {
     \panopto_data::remove_all_panopto_adhoc_tasks();
 
diff --git a/lib/cli/rename_all_folders_cli.php b/lib/cli/rename_all_folders_cli.php
index 8f0976b..4b262d1 100644
--- a/lib/cli/rename_all_folders_cli.php
+++ b/lib/cli/rename_all_folders_cli.php
@@ -15,16 +15,17 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
+ * This is needed for the Panopto Generation 1 to Generation 2 migration.
+ *
  * This logic will get a list of all current Panopto folders on a Moodle server then it will go through each folder
  * and reprovision them and reinitialize the imports to that folders if the user has access to the folder.
- * This is needed for the Panopto Generation 1 to Generation 2 migration.
  *
  * @package block_panopto
  * @copyright  Panopto 2009 - 2017 with contributions from Hittesh Ahuja
  * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
-// Do not require MOODLE_INTERNAL definition since this is a CLI file. 
+// Do not require MOODLE_INTERNAL definition since this is a CLI file.
 
 define('CLI_SCRIPT', true);
 
diff --git a/lib/cli/upgrade_all_folders_cli.php b/lib/cli/upgrade_all_folders_cli.php
index 5c00706..722f30e 100644
--- a/lib/cli/upgrade_all_folders_cli.php
+++ b/lib/cli/upgrade_all_folders_cli.php
@@ -15,16 +15,17 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
+ * This is needed for the Panopto Generation 1 to Generation 2 migration.
+ *
  * This logic will get a list of all current Panopto folders on a Moodle server then it will go through each folder
  * and reprovision them and reinitialize the imports to that folders if the user has access to the folder.
- * This is needed for the Panopto Generation 1 to Generation 2 migration.
  *
  * @package block_panopto
  * @copyright  Panopto 2009 - 2017 with contributions from Hittesh Ahuja
  * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
-// Do not require MOODLE_INTERNAL definition since this is a CLI file. 
+// Do not require MOODLE_INTERNAL definition since this is a CLI file.
 
 define('CLI_SCRIPT', true);
 
diff --git a/lib/panopto_auth_soap_client.php b/lib/panopto_auth_soap_client.php
index 883cfa6..0c640d4 100644
--- a/lib/panopto_auth_soap_client.php
+++ b/lib/panopto_auth_soap_client.php
@@ -37,9 +37,15 @@
 require_once(dirname(__FILE__) . '/block_panopto_lib.php');
 require_once(dirname(__FILE__) . '/panopto_timeout_soap_client.php');
 
+/**
+ * Panopto auth soap client class.
+ *
+ * @package block_panopto
+ * @copyright  Panopto 2009 - 2016
+ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
 class panopto_auth_soap_client extends PanoptoTimeoutSoapClient {
 
-
     /**
      * @var array $authparam
      */
@@ -72,7 +78,7 @@ class panopto_auth_soap_client extends PanoptoTimeoutSoapClient {
     public $panoptoauthcookies;
 
     /**
-     * main constructor
+     * Main constructor
      *
      * @param string $servername
      * @param string $apiuseruserkey
@@ -87,13 +93,13 @@ public function __construct($servername, $apiuseruserkey, $apiuserauthcode) {
             $apiuseruserkey
         );
 
-        $this->serviceparams = panopto_generate_wsdl_service_params('https://'. $servername . '/Panopto/PublicAPI/4.2/Auth.svc?singlewsdl');
+        $this->serviceparams =
+            panopto_generate_wsdl_service_params('https://'. $servername . '/Panopto/PublicAPI/4.2/Auth.svc?singlewsdl');
         $this->serviceparams['wsdl_trace'] = true;
-
     }
 
     /**
-     * gets the version of the server.
+     * Gets the version of the server.
      */
     public function get_server_version() {
         $returnvalue = false;
@@ -105,14 +111,15 @@ public function get_server_version() {
         if ($this->authmanagementserviceget->GetServerVersion()) {
             $returnvalue = $this->authmanagementserviceget->getResult()->GetServerVersionResult;
         } else {
-            \panopto_data::print_log(print_r($this->authmanagementserviceget->getLastError(), true));
+            \panopto_data::print_log(var_export($this->authmanagementserviceget->getLastError(), true));
         }
         return $returnvalue;
     }
 
     /**
      * Returns the version number of the current Panopto server.
-     * @param string $idprovidername - instnace name for current server IDP
+     *
+     * @param string $idprovidername - instance name for current server IDP
      * @param string $moduleversion - current plug in version
      * @param string $targetplatformversion - Moodle version
      */
@@ -134,20 +141,20 @@ public function report_integration_info($idprovidername, $moduleversion, $target
             $returnvalue = true;
         } else {
             $lasterror = $this->authmanagementservicereport->getLastError()['AuthManagementServiceReport::ReportIntegrationInfo'];
-            \panopto_data::print_log(print_r($lasterror, true));
+            \panopto_data::print_log(var_export($lasterror, true));
         }
 
         return $returnvalue;
     }
 
     /**
-     * Logs the user into the WS service and retrieves the cookie for later use. 
+     * Logs the user into the WS service and retrieves the cookie for later use.
      */
     public function log_on_with_external_provider() {
         $this->authmanagementservicelog = new AuthManagementServiceLog($this->serviceparams, true);
 
         $logonparams = new AuthManagementStructLogOnWithExternalProvider(
-            $this->authparam->getUserKey(), 
+            $this->authparam->getUserKey(),
             $this->authparam->getAuthCode()
         );
 
@@ -157,7 +164,7 @@ public function log_on_with_external_provider() {
             $this->panoptoauthcookies = $soapclient->getpanoptocookies();
         } else {
             $lasterror = $this->authmanagementservicelog->getLastError()['AuthManagementServiceLog::LogOnWithExternalProvider'];
-            \panopto_data::print_log(print_r($lasterror, true));
+            \panopto_data::print_log(var_export($lasterror, true));
         }
     }
 }
diff --git a/lib/panopto_category_data.php b/lib/panopto_category_data.php
index 3c0f21c..943fbfc 100644
--- a/lib/panopto_category_data.php
+++ b/lib/panopto_category_data.php
@@ -15,7 +15,7 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * contains main Panopto getters
+ * Contains main Panopto getters.
  *
  * @package block_panopto
  * @copyright  Panopto 2009 - 2018 /With contributions from Spenser Jones (sjones@ambrose.edu), and Tim Lock
@@ -78,18 +78,20 @@ class panopto_category_data {
 
     /**
      * @var bool $hasvalidpanoptoversion whether or not our panoptoversion is high enough
-     */ 
+     */
     private $hasvalidpanoptoversion;
 
     /**
-     * @var string $categoriesrequiredpanoptoversion Any block_panopto newer than 2018120700 will require a Panopto server to be at least this version to be able to make any category structure calls
+     * @var string $categoriesrequiredpanoptoversion Require a minimum Panopto server version for category structure calls
      */
     public static $categoriesrequiredpanoptoversion = '6.0.0';
 
     /**
-     * main constructor
+     * Main constructor
      *
-     * @param int $moodlecategoryid course id class is being provisioned for. Can be null for bulk provisioning and manual provisioning.
+     * @param int $moodlecategoryid Category ID to use when provisioning class. Can be null for bulk or manual provisioning.
+     * @param string $selectedserver server name
+     * @param string $selectedkey application key
      */
     public function __construct($moodlecategoryid, $selectedserver, $selectedkey) {
         global $USER;
@@ -118,8 +120,8 @@ public function __construct($moodlecategoryid, $selectedserver, $selectedkey) {
 
         if ($this->activepanoptoserverversion != false) {
             $this->hasvalidpanoptoversion = version_compare(
-                $this->activepanoptoserverversion, 
-                \panopto_category_data::$categoriesrequiredpanoptoversion, 
+                $this->activepanoptoserverversion,
+                self::$categoriesrequiredpanoptoversion,
                 '>='
             );
         } else {
@@ -169,18 +171,19 @@ public function ensure_auth_manager() {
      * We need to retrieve the current category mapping in the constructor, so this must be static.
      *
      * @param int $moodlecategoryid id of the current Moodle course
+     * @param int $targetserver target server id
      */
     public static function get_panopto_category_id($moodlecategoryid, $targetserver) {
         global $DB;
         return $DB->get_field(
-            'block_panopto_categorymap', 
-            'panopto_id', 
+            'block_panopto_categorymap',
+            'panopto_id',
             array('category_id' => $moodlecategoryid, 'panopto_id' => $targetserver)
         );
     }
 
     /**
-     *  Retrieve the servername for the current course
+     * Retrieve the servername for the current course
      *
      * @param int $moodlecategoryid id of the current Moodle course
      */
@@ -190,9 +193,11 @@ public static function get_panopto_servername($moodlecategoryid) {
     }
 
     /**
-     *  Builds a list of folders from the target category to the root level in Moodle, sends the data to Panopto to build those folders and set 
-     *    folder parents to match the requested structure.
+     * Builds a list of folders from the target category to the root level in Moodle,
+     * sends the data to Panopto to build those folders and set folder parents to match the requested structure.
      *
+     * @param bool $usehtmloutput if we should use html output or not
+     * @param object $leafcoursedata course data
      */
     public function ensure_category_branch($usehtmloutput, $leafcoursedata) {
         global $DB;
@@ -201,7 +206,7 @@ public function ensure_category_branch($usehtmloutput, $leafcoursedata) {
 
             $panoptoversioninfo = [
                 'activepanoptoversion' => $this->activepanoptoserverversion,
-                'requiredpanoptoversion' => \panopto_category_data::$categoriesrequiredpanoptoversion
+                'requiredpanoptoversion' => self::$categoriesrequiredpanoptoversion
             ];
 
             if ($usehtmloutput) {
@@ -209,13 +214,12 @@ public function ensure_category_branch($usehtmloutput, $leafcoursedata) {
             } else {
                 \panopto_data::print_log(get_string('categories_need_newer_panopto', 'block_panopto', $panoptoversioninfo));
             }
-        } 
-        else {
+        } else {
             try {
 
                 $targetcategory = $DB->get_record('course_categories', array('id' => $this->moodlecategoryid));
 
-                // Some users have categories with no name, so default it to id. 
+                // Some users have categories with no name, so default it to id.
                 $targetcategoryname = !empty(trim($targetcategory->name)) ? $targetcategory->name : $targetcategory->id;
 
                 $branchinfo = [
@@ -228,33 +232,33 @@ public function ensure_category_branch($usehtmloutput, $leafcoursedata) {
                 } else {
                     \panopto_data::print_log_verbose(get_string('ensure_category_branch_start', 'block_panopto', $branchinfo));
                 }
-                
+
                 $categoryheirarchy = array();
 
                 if (isset($leafcoursedata) && !empty($leafcoursedata)) {
                     // We don't need to pass a name into this constructor since we can assume course folders exist.
                     $categoryheirarchy[] = new SessionManagementStructExternalHierarchyInfo(
-                        null, 
-                        $leafcoursedata->moodlecourseid,
-                        true
+                        true,
+                        null,
+                        $leafcoursedata->moodlecourseid
                     );
                 }
 
                 $categoryheirarchy[] = new SessionManagementStructExternalHierarchyInfo(
-                    $targetcategoryname, 
-                    $targetcategory->id,
-                    false
+                    false,
+                    $targetcategoryname,
+                    $targetcategory->id
                 );
-                
+
                 $currentcategory = $DB->get_record('course_categories', array('id' => $targetcategory->parent));
 
-                while(isset($currentcategory) && !empty($currentcategory)) {
+                while (isset($currentcategory) && !empty($currentcategory)) {
                     $currentcategoryname = !empty(trim($currentcategory->name)) ? $currentcategory->name : $currentcategory->id;
 
                     $categoryheirarchy[] = new SessionManagementStructExternalHierarchyInfo(
-                        $currentcategoryname, 
-                        $currentcategory->id,
-                        false
+                        false,
+                        $currentcategoryname,
+                        $currentcategory->id
                     );
 
                     $currentcategory = $DB->get_record('course_categories', array('id' => $currentcategory->parent));
@@ -262,7 +266,7 @@ public function ensure_category_branch($usehtmloutput, $leafcoursedata) {
 
                 $this->ensure_session_manager();
 
-                // reverse $categoryheirarchy so the root node of the Moodle category tree is the first element, and the target category is the last element.
+                // Reverse $categoryheirarchy so the root node of the category tree is first, and the target category is last.
                 $ensureresults = $this->sessionmanager->ensure_category_branch(array_reverse($categoryheirarchy));
 
                 if (isset($ensureresults) && isset($ensureresults->Results) && !empty($ensureresults->Results)) {
@@ -272,7 +276,7 @@ public function ensure_category_branch($usehtmloutput, $leafcoursedata) {
                 }
 
                 if ($categorydata !== null && $categorydata !== false) {
-                  $this->save_category_data_to_table($categorydata, $usehtmloutput, $leafcoursedata);
+                    $this->save_category_data_to_table($categorydata, $usehtmloutput, $leafcoursedata);
                 } else if (!$usehtmloutput) {
                     \panopto_data::print_log(get_string('ensure_category_branch_failed', 'block_panopto'));
                 } else {
@@ -281,11 +285,18 @@ public function ensure_category_branch($usehtmloutput, $leafcoursedata) {
 
                 return $categorydata;
             } catch (Exception $e) {
-                \panopto_data::print_log(print_r($e->getMessage(), true));
+                \panopto_data::print_log($e->getMessage());
             }
         }
     }
 
+    /**
+     * Save category date to appropriate table.
+     *
+     * @param array $categorybranchdata category branch data
+     * @param bool $usehtmloutput if we should use html output or not
+     * @param object $leafcoursedata course data
+     */
     private function save_category_data_to_table($categorybranchdata, $usehtmloutput, $leafcoursedata) {
         global $DB;
         $row = (object) array(
@@ -297,10 +308,10 @@ private function save_category_data_to_table($categorybranchdata, $usehtmloutput
 
         $ensuredbranch = '';
         $leafcoursesessiongroupid = (isset($leafcoursedata) && !empty($leafcoursedata)) ? $leafcoursedata->sessiongroupid : null;
-        foreach($categorybranchdata as $updatedcategory) {
+        foreach ($categorybranchdata as $updatedcategory) {
 
             // Format the output string for the next child in the branch.
-            // This is the string to be displayed in the log or UI, use name instead of Id so it's more readeable
+            // This is the string to be displayed in the log or UI, use name instead of Id so it's more readeable.
             if (!empty($ensuredbranch)) {
                 $ensuredbranch .= ' -> ';
             }
@@ -309,12 +320,12 @@ private function save_category_data_to_table($categorybranchdata, $usehtmloutput
 
             // If the returned folder was the leaf course folder no need to save it.
             if (strcmp($leafcoursesessiongroupid, $updatedcategory->Id) !== 0) {
-                // $updatedcategory->ExternalIds->string[0] is the format the PHP wsdl mapper returns our call data
-                //  We also need to strip <instance_name>// off the externalId to get the true category Id
+                // The $updatedcategory->ExternalIds->string[0] is the format the PHP wsdl mapper returns our call data.
+                // We also need to strip <instance_name>// off the externalId to get the true category Id.
                 $row->category_id = str_replace($this->instancename . '\\', '', $updatedcategory->ExternalIds->string[0]);
                 $row->panopto_id = $updatedcategory->Id;
 
-                panopto_category_data::update_category_row($row);
+                self::update_category_row($row);
             }
         }
 
@@ -325,6 +336,13 @@ private function save_category_data_to_table($categorybranchdata, $usehtmloutput
         }
     }
 
+    /**
+     * Build necessary category structure.
+     *
+     * @param bool $usehtmloutput if we should use html output or not
+     * @param string $selectedserver server name
+     * @param string $selectedkey selected key
+     */
     public static function build_category_structure($usehtmloutput, $selectedserver, $selectedkey) {
         global $DB;
 
@@ -333,25 +351,23 @@ public static function build_category_structure($usehtmloutput, $selectedserver,
         $categorybuilder = new \panopto_category_data(null, $selectedserver, $selectedkey);
         $categorybuilder->ensure_auth_manager();
 
-
         if (!$categorybuilder->hasvalidpanoptoversion) {
-                $panoptoversioninfo = [
-                    'activepanoptoversion' => $categorybuilder->activepanoptoserverversion,
-                    'requiredpanoptoversion' => \panopto_category_data::$categoriesrequiredpanoptoversion];
+            $panoptoversioninfo = [
+                'activepanoptoversion' => $categorybuilder->activepanoptoserverversion,
+                'requiredpanoptoversion' => self::$categoriesrequiredpanoptoversion];
 
             if ($usehtmloutput) {
                 include('views/ensure_category_branch_failed.html.php');
             } else {
                 \panopto_data::print_log(get_string('categories_need_newer_panopto', 'block_panopto', $panoptoversioninfo));
             }
-        } 
-        else {
-            // Get all categories with no children (all leaf nodes)
+        } else {
+            // Get all categories with no children (all leaf nodes).
             $leafcategories = $DB->get_records_sql(
                 'SELECT id FROM {course_categories} WHERE id NOT IN (SELECT parent FROM {course_categories})'
             );
 
-            foreach($leafcategories as $leafcategory) {
+            foreach ($leafcategories as $leafcategory) {
                 $categorybuilder->moodlecategoryid = $leafcategory->id;
                 $categorybuilder->sessiongroupid = self::get_panopto_category_id($leafcategory->id, $selectedserver);
                 $categorybuilder->ensure_category_branch($usehtmloutput, null);
@@ -359,17 +375,22 @@ public static function build_category_structure($usehtmloutput, $selectedserver,
         }
     }
 
+    /**
+     * Update category row in categorymap
+     *
+     * @param object $row category data row to update
+     */
     private static function update_category_row($row) {
         global $DB;
 
         $oldrow = $DB->get_record(
-            'block_panopto_categorymap', 
+            'block_panopto_categorymap',
             array(
-                'category_id' => $row->category_id, 
+                'category_id' => $row->category_id,
                 'panopto_server' => $row->panopto_server
             )
         );
-        
+
         if ($oldrow) {
             $row->id = $oldrow->id;
             return $DB->update_record('block_panopto_categorymap', $row);
@@ -377,4 +398,4 @@ private static function update_category_row($row) {
             return $DB->insert_record('block_panopto_categorymap', $row);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/lib/panopto_data.php b/lib/panopto_data.php
index 8f6c698..e139c5c 100644
--- a/lib/panopto_data.php
+++ b/lib/panopto_data.php
@@ -15,7 +15,7 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * contains main Panopto getters
+ * Contains main Panopto getters
  *
  * @package block_panopto
  * @copyright  Panopto 2009 - 2018 /With contributions from Spenser Jones (sjones@ambrose.edu), and Tim Lock
@@ -92,7 +92,7 @@ class panopto_data {
     public $uname;
 
     /**
-     * @var string $currentcoursename The name of the current course in Panopto folder name format 
+     * @var string $currentcoursename The name of the current course in Panopto folder name format
      */
     public $currentcoursename;
 
@@ -107,24 +107,27 @@ class panopto_data {
     private static $requiredversion = 2014051200;
 
     /**
-     * @var string $requiredpanoptoversion Any block_panopto newer than 2017061000 will require a Panopto server to be at least this version to succeed.
+     * @var string $requiredpanoptoversion Any block_panopto newer than 2017061000
+     * will require a Panopto server to be at least this version to succeed.
      */
     public static $requiredpanoptoversion = '5.4.0';
 
     /**
-     * @var string $unprovisionrequiredpanoptoversion The UnprovisionExternalCourse endpoint was only added in 7.0.0 so 
+     * @var string $unprovisionrequiredpanoptoversion The UnprovisionExternalCourse endpoint was only added in 7.0.0 so
      * anyone using an older Panopto server should not be able to attempt to use this endpoint.
      */
     public static $unprovisionrequiredpanoptoversion = '7.0.0';
 
     /**
      * @var string $ccv2requiredpanoptoversion if the Panopto server is using this version then all course copy calls must
-     *   use the new endpoint. 
+     *   use the new endpoint.
      */
     public static $ccv2requiredpanoptoversion = '12.0.0';
 
     /**
-     * @return returns an array of possible values for the Panopt folder name style
+     * Returns an array of possible values for the Panopto folder name style
+     *
+     * @return array
      */
     public static function getpossiblefoldernamestyles() {
         return array(
@@ -134,8 +137,10 @@ public static function getpossiblefoldernamestyles() {
         );
     }
     /**
-     * @return returns an array of possible values for the Panopt folder name style
-     */                    
+     * Returns an array of possible values for the Panopto folder name style
+     *
+     * @return array
+     */
     public static function getpossibleprovisiontypes() {
         return array(
             'off' => get_string('autoprovision_off', 'block_panopto'),
@@ -144,7 +149,9 @@ public static function getpossibleprovisiontypes() {
         );
     }
     /**
-     * @return the possible list of SSO sync types
+     * Return the possible list of SSO sync types
+     *
+     * @return array
      */
     public static function getpossiblessosynctypes() {
         return array(
@@ -154,7 +161,11 @@ public static function getpossiblessosynctypes() {
         );
     }
 
-
+    /**
+     * Delete any existing ashoc tasks
+     *
+     * @return $DB
+     */
     public static function remove_all_panopto_adhoc_tasks() {
         global $DB;
 
@@ -162,9 +173,10 @@ public static function remove_all_panopto_adhoc_tasks() {
     }
 
     /**
-     * main constructor
+     * Main constructor
      *
-     * @param int $moodlecourseid course id class is being provisioned for. Can be null for bulk provisioning and manual provisioning.
+     * @param int $moodlecourseid course id class is being provisioned for.
+     * Can be null for bulk provisioning and manual provisioning.
      */
     public function __construct($moodlecourseid) {
         global $USER, $DB;
@@ -174,7 +186,8 @@ public function __construct($moodlecourseid) {
 
         // Get servername and application key specific to Moodle course if ID is specified.
         if (isset($moodlecourseid) && !empty($moodlecourseid)) {
-            $foldermapdata = $DB->get_record('block_panopto_foldermap', array('moodleid' => $moodlecourseid), 'panopto_server,panopto_id');
+            $foldermapdata = $DB->get_record('block_panopto_foldermap',
+                array('moodleid' => $moodlecourseid), 'panopto_server,panopto_id');
             if (!empty($foldermapdata)) {
                 $this->servername = $foldermapdata->panopto_server;
                 $this->sessiongroupid = $foldermapdata->panopto_id;
@@ -189,12 +202,14 @@ public function __construct($moodlecourseid) {
         } else {
             $username = 'guest';
         }
-        
+
         $this->uname = $username;
     }
 
     /**
      * Returns SystemInfo.
+     *
+     * @return object
      */
     public function get_recorder_download_urls() {
 
@@ -207,11 +222,12 @@ public function get_recorder_download_urls() {
      * Returns if the logged in user can provision.
      *
      * @param int $courseid the Moodle id of the course we are checking
+     * @return bool
      */
     public function can_user_provision($courseid) {
         global $USER;
 
-        // Get the context of the course so we can get capaibilities.
+        // Get the context of the course so we can get capabilities.
         $context = context_course::instance($courseid, MUST_EXIST);
 
         return has_capability('block/panopto:provision_aspublisher', $context, $USER->id) ||
@@ -222,8 +238,9 @@ public function can_user_provision($courseid) {
     /**
      * Return the correct role for a user, given a context.
      *
-     * @param int $contextid
-     * @param int $userid
+     * @param context_course $context context id
+     * @param int $userid user id for which we are getting the role.
+     * @return string
      */
     public static function get_role_from_context($context, $userid) {
         $role = 'Viewer';
@@ -284,11 +301,13 @@ public function ensure_auth_manager() {
     /**
      * Return the user manager, if it does not yet exist try to create it.
      *
-     * @param $usertomanage since the User management works on the user passed in through the auth param we need to pass the uname for the user we are managing.
+     * @param string $usertomanage since the User management works on the user passed in
+     * through the auth param we need to pass the uname for the user we are managing.
      */
     public function ensure_user_manager($usertomanage) {
         // If no session soap client exists instantiate one.
-        if (!isset($this->usermanager) || ($this->usermanager->authparam->UserKey !== $this->panopto_decorate_username($usertomanage))) {
+        if (!isset($this->usermanager) ||
+            ($this->usermanager->authparam->UserKey !== $this->panopto_decorate_username($usertomanage))) {
 
             // If no auth soap client for this instance, instantiate one.
             $this->usermanager = panopto_instantiate_user_soap_client(
@@ -307,6 +326,8 @@ public function ensure_user_manager($usertomanage) {
      * Create the Panopto course folder and populate its ACLs.
      *
      * @param object $provisioninginfo info for course being provisioned
+     * @param bool $skipusersync should we skip user sync or not
+     * @return object
      */
     public function provision_course($provisioninginfo, $skipusersync) {
         global $CFG, $USER, $DB;
@@ -370,32 +391,33 @@ public function provision_course($provisioninginfo, $skipusersync) {
                 $courseinfo->viewers = array();
                 $courseinfo->creators = array();
                 $courseinfo->publishers = array();
-                
-                // sync every user enrolled in the course
+
+                // Sync every user enrolled in the course.
                 foreach ($enrolledusers as $enrolleduser) {
                     $userrole = self::get_role_from_context($coursecontext, $enrolleduser->id);
-                    $panoptousername =  $this->instancename . '\\' . $enrolleduser->username;
+                    $panoptousername = $this->instancename . '\\' . $enrolleduser->username;
 
-                    if(strpos($userrole, 'Publisher') !== FALSE) {
+                    if (strpos($userrole, 'Publisher') !== false) {
                         $courseinfo->publishers[] = $panoptousername;
-                        if(strpos($userrole, 'Creator') !== FALSE) {
+                        if (strpos($userrole, 'Creator') !== false) {
                             $courseinfo->creators[] = $panoptousername;
                         }
-                    } else if(strpos($userrole, 'Creator') !== FALSE) {
+                    } else if (strpos($userrole, 'Creator') !== false) {
                         $courseinfo->creators[] = $panoptousername;
                     } else {
                         $courseinfo->viewers[] = $panoptousername;
                     }
 
-                    // syncs every user enrolled in the course, this is fairly expensive so it should be normally turned off.
+                    // Syncs every user enrolled in the course, this is fairly expensive so it should be normally turned off.
                     if (get_config('block_panopto', 'sync_after_provisioning')) {
                         $this->sync_external_user($enrolleduser->id);
                     }
                 }
 
                 if (!$skipusersync && $this->uname !== 'guest') {
-                    // uname will be guest is provisioning/upgrading through cli, no need to sync this 'user'.
-                    // This is intended to make sure provisioning teachers get access without relogging, so we only need to perform this if we aren't syncing all enrolled users.
+                    // Uname will be guest is provisioning/upgrading through cli, no need to sync this 'user'.
+                    // This is intended to make sure provisioning teachers get access without relogging,
+                    // so we only need to perform this if we aren't syncing all enrolled users.
 
                     // Update permissions so user can see everything they should.
                     $this->sync_external_user($USER->id);
@@ -415,7 +437,6 @@ public function provision_course($provisioninginfo, $skipusersync) {
                     }
                 }
             } else {
-
                 $provisionresponse = $courseinfo;
                 // Give the user some basic info they can use to debug or send to AE.
                 $courseinfo->moodlecourseid = $this->moodlecourseid;
@@ -443,6 +464,7 @@ public function provision_course($provisioninginfo, $skipusersync) {
     /**
      * Removes the external context and group mappings from a folder in Panopto
      *
+     * @return bool
      */
     public function unprovision_course() {
         global $CFG, $USER, $DB;
@@ -450,8 +472,8 @@ public function unprovision_course() {
         $this->ensure_auth_manager();
         $activepanoptoserverversion = $this->authmanager->get_server_version();
         $hasvalidpanoptoversion = version_compare(
-            $activepanoptoserverversion, 
-            self::$unprovisionrequiredpanoptoversion, 
+            $activepanoptoserverversion,
+            self::$unprovisionrequiredpanoptoversion,
             '>='
         );
 
@@ -469,7 +491,7 @@ public function unprovision_course() {
                     );
                 }
             } catch (Exception $e) {
-                self::print_log(print_r($e->getMessage(), true));
+                self::print_log($e->getMessage());
                 return false;
             }
 
@@ -477,11 +499,12 @@ public function unprovision_course() {
             self::delete_panopto_relation($this->moodlecourseid, true);
             return true;
         }
-     }
+    }
 
     /**
-     *  Fetch course name and membership info from DB in preparation for provisioning operation.
+     * Fetch course name and membership info from DB in preparation for provisioning operation.
      *
+     * @return object
      */
     public function get_provisioning_info() {
         global $DB;
@@ -493,7 +516,8 @@ public function get_provisioning_info() {
         $provisioninginfo = new stdClass;
 
         // If we are provisioning a course with a panopto_id set we should provision that folder.
-        // We need to keep this because users can map to folders that weren't created in Moodle so Moodle has no knowledge of the externalcourseid.
+        // We need to keep this because users can map to folders that weren't created in Moodle,
+        // so Moodle has no knowledge of the externalcourseid.
         $hasvalidpanoptoid = isset($this->sessiongroupid) && !empty($this->sessiongroupid);
 
         if ($hasvalidpanoptoid) {
@@ -503,17 +527,15 @@ public function get_provisioning_info() {
         if (isset($mappedpanoptocourse) && !empty($mappedpanoptocourse->Name)) {
             $provisioninginfo->sessiongroupid = $this->sessiongroupid;
             $provisioninginfo->fullname = $mappedpanoptocourse->Name;
-
-        } 
-        else if (isset($mappedpanoptocourse) && 
-                 isset($mappedpanoptocourse->noaccess) && 
-                 $mappedpanoptocourse->noaccess == true) {
+        } else if (isset($mappedpanoptocourse) &&
+                isset($mappedpanoptocourse->noaccess) &&
+                $mappedpanoptocourse->noaccess == true) {
 
             $provisioninginfo->accesserror = true;
             return $provisioninginfo;
         } else {
-            if (isset($mappedpanoptocourse) && 
-                isset($mappedpanoptocourse->notfound) && 
+            if (isset($mappedpanoptocourse) &&
+                isset($mappedpanoptocourse->notfound) &&
                 $mappedpanoptocourse->notfound == true) {
 
                 // If we had a sessiongroupid set from a previous folder, but that folder was not found on Panopto.
@@ -535,7 +557,7 @@ public function get_provisioning_info() {
                 $provisioninginfo->longname = $coursenameinfo->fullname;
 
                 $provisioninginfo->fullname = $this->get_new_folder_name(
-                    $provisioninginfo->shortname, 
+                    $provisioninginfo->shortname,
                     $provisioninginfo->longname
                 );
             }
@@ -556,23 +578,27 @@ public function update_folder_name() {
         return $this->sessionmanager->update_folder_name($this->sessiongroupid, $this->currentcoursename);
     }
 
-    /** 
+    /**
      * Attempts to map the externalId(moodle course Id) to the currently assigned Panopto folder.
      * A properly mapped externalId is necessary for most non-plugin LTI based workflows so we need to make sure
      *   this is kept up-to-date when a user custom maps a new folder to the course.
-     */ 
+     */
     public function update_folder_external_id_with_provider() {
         $this->ensure_session_manager();
         return $this->sessionmanager->update_folder_external_id_with_provider(
-            $this->sessiongroupid, 
-            $this->moodlecourseid, 
+            $this->sessiongroupid,
+            $this->moodlecourseid,
             $this->instancename
         );
     }
 
-    /** 
-     * Generates the name for a Panopto folder depending on the course name and chosen folder name style 
-     */ 
+    /**
+     * Generates the name for a Panopto folder depending on the course name and chosen folder name style
+     *
+     * @param string $shortname course short name
+     * @param string $longname course long name
+     * @return string
+     */
     public function get_new_folder_name($shortname, $longname) {
         global $DB;
 
@@ -615,11 +641,11 @@ public function get_new_folder_name($shortname, $longname) {
         return $fullname;
     }
 
-    /** 
+    /**
      * This will copy Panopto content from one course panopto folder to another course panopto folder
-     * 
+     *
      * @param int $originalcourseid - the moodle id of the course we are trying to copy Panopto content from
-     * 
+     * @return array
      */
     public function copy_panopto_content($originalcourseid) {
         global $USER;
@@ -631,7 +657,7 @@ public function copy_panopto_content($originalcourseid) {
         $coursecopytask->SourceCourseContexts = array($originalcourseid);
         $coursecopytask->TargetCourseContext = $this->moodlecourseid;
 
-        // The api call takes an array but moodle logging can't handle this well so an extra variable is needed for logging
+        // The api call takes an array but moodle logging can't handle this well so an extra variable is needed for logging.
         $coursecopylogdata = new stdClass;
         $coursecopylogdata->SourceCourseContext = $originalcourseid;
         $coursecopylogdata->TargetCourseContext = $this->moodlecourseid;
@@ -650,7 +676,7 @@ public function copy_panopto_content($originalcourseid) {
         } else if (!isset($provisioninginfo->accesserror)) {
             $this->ensure_auth_manager();
 
-            // This call will log the user into Panopto using the SOAP API and it will also store the Panopto cookies
+            // This call will log the user into Panopto using the SOAP API and it will also store the Panopto cookies.
             $this->authmanager->log_on_with_external_provider();
 
             // Only do this code if we have proper access to the target Panopto course folder.
@@ -658,7 +684,7 @@ public function copy_panopto_content($originalcourseid) {
 
             $curl = new \curl();
             $aspxauthcookie = "";
-            foreach($this->authmanager->panoptoauthcookies as $key => $value) {
+            foreach ($this->authmanager->panoptoauthcookies as $key => $value) {
                 if (strpos(strtolower($key), 'aspxauth') !== false) {
                     $aspxauthcookie = $value;
                     break;
@@ -670,27 +696,27 @@ public function copy_panopto_content($originalcourseid) {
                 $importresult->importedcourseid = $originalcourseid;
                 $importresult->errormessage = get_string('copy_api_auth_error', 'block_panopto', $this->servername);
                 $importresults[] = $importresult;
-                \panopto_data::print_log(get_string('copy_api_auth_error', 'block_panopto', $importresult));
+                self::print_log(get_string('copy_api_auth_error', 'block_panopto', $importresult));
                 return $importresults;
             }
 
             $options = [
-                'CURLOPT_VERBOSE' => FALSE,
-                'CURLOPT_RETURNTRANSFER' => TRUE,
-                'CURLOPT_HEADER' => FALSE,
+                'CURLOPT_VERBOSE' => false,
+                'CURLOPT_RETURNTRANSFER' => true,
+                'CURLOPT_HEADER' => false,
                 'CURLOPT_HTTPHEADER' => array('Content-Type: application/json',
                                               'Cookie: .ASPXAUTH='.$aspxauthcookie)
             ];
 
-            $socket_timeout = get_config('block_panopto', 'panopto_socket_timeout');
-            $connection_timeout =  get_config('block_panopto', 'panopto_connection_timeout');
+            $sockettimeout = get_config('block_panopto', 'panopto_socket_timeout');
+            $connectiontimeout = get_config('block_panopto', 'panopto_connection_timeout');
 
-            if (!!$socket_timeout) {
-                $options['CURLOPT_TIMEOUT'] = $socket_timeout;
+            if (!!$sockettimeout) {
+                $options['CURLOPT_TIMEOUT'] = $sockettimeout;
             }
 
-            if (!!$connection_timeout) {
-                $options['CURLOPT_CONNECTTIMEOUT'] = $connection_timeout;
+            if (!!$connectiontimeout) {
+                $options['CURLOPT_CONNECTTIMEOUT'] = $connectiontimeout;
             }
 
             $proxyhost = get_config('block_panopto', 'wsdl_proxy_host');
@@ -703,10 +729,10 @@ public function copy_panopto_content($originalcourseid) {
             if (!empty($proxyport)) {
                 $options['CURLOPT_PROXYPORT'] = $proxyport;
             }
-            
+
             $response = json_decode($curl->post($location, json_encode($coursecopytask), $options));
 
-            if(empty($response)) {
+            if (empty($response)) {
                 $importresult = new stdClass;
                 $importresult->importedcourseid = $originalcourseid;
                 $importresults[] = $importresult;
@@ -715,7 +741,7 @@ public function copy_panopto_content($originalcourseid) {
                 $importresult->importedcourseid = $originalcourseid;
                 $importresult->errormessage = get_string('copy_api_error', 'block_panopto', $importresult);
                 $importresults[] = $importresult;
-                \panopto_data::print_log(get_string('copy_api_error_response', 'block_panopto', $response));
+                self::print_log(get_string('copy_api_error_response', 'block_panopto', $response));
             }
         } else {
             $importresult = new stdClass;
@@ -731,10 +757,10 @@ public function copy_panopto_content($originalcourseid) {
      * Initializes and syncs a possible new import
      *
      * @param int $newimportid the id of the course being imported
-     *
+     * @return array
      */
     public function init_and_sync_import_ccv1($newimportid) {
-        $importresults = array(); 
+        $importresults = array();
         $handledimports = array();
 
         self::print_log_verbose(get_string('init_import_target', 'block_panopto', $this->moodlecourseid));
@@ -745,7 +771,8 @@ public function init_and_sync_import_ccv1($newimportid) {
         $importinarray = in_array($newimportid, $currentimportsources);
 
         if (!$importinarray) {
-            // If a course is already listed as an import we don't need to add it to the import array, but we can still resync the groups.
+            // If a course is already listed as an import we don't need to add it to the import array,
+            // but we can still resync the groups.
             self::add_new_course_import($this->moodlecourseid, $newimportid);
         }
 
@@ -757,12 +784,12 @@ public function init_and_sync_import_ccv1($newimportid) {
         } else if (!isset($provisioninginfo->accesserror)) {
             $sessiongroupids = array();
             $sessiongroupids[] = $importpanopto->sessiongroupid;
-            // We need to make sure this course gets access to anything the course it imported had access to. 
+            // We need to make sure this course gets access to anything the course it imported had access to.
             $nestedimports = self::get_import_list($newimportid);
             $nestedimportresults = array();
             foreach ($nestedimports as $nestedimportid) {
                 $nestedimportpanopto = new \panopto_data($nestedimportid);
-                // If we are importing a nested child make sure we have not already imported 
+                // If we are importing a nested child make sure we have not already imported.
                 if (isset($nestedimportpanopto->sessiongroupid) && !in_array($nestedimportid, $handledimports)) {
                     $handledimports[] = $nestedimportid;
                     $sessiongroupids[] = $nestedimportpanopto->sessiongroupid;
@@ -834,7 +861,7 @@ public function get_folders_by_id() {
      *
      */
     public function get_folders_by_id_no_sync() {
-        
+
         if (isset($this->sessiongroupid)) {
             $this->ensure_session_manager();
 
@@ -887,6 +914,7 @@ public function get_creator_folders_list() {
     /**
      * Sync a user with all of the courses he is enrolled in on the current Panopto server
      *
+     * @param int $userid external user id
      */
     public function sync_external_user($userid) {
         global $DB, $CFG;
@@ -909,9 +937,10 @@ public function sync_external_user($userid) {
 
                 $coursepanopto = new \panopto_data($course->id);
 
-                // Check to see if we are already going to provision a specific Panopto server, if we are just add the groups to the already made array
-                // If not add the server to the list of servers.
-                if (isset($coursepanopto->servername) && !empty($coursepanopto->servername) && $coursepanopto->servername === $this->servername &&
+                // Check to see if we are already going to provision a specific Panopto server,
+                // if we are just add the groups to the already made array. If not add the server to the list of servers.
+                if (isset($coursepanopto->servername) && !empty($coursepanopto->servername) &&
+                    $coursepanopto->servername === $this->servername &&
                     isset($coursepanopto->applicationkey) && !empty($coursepanopto->applicationkey) &&
                     isset($coursepanopto->sessiongroupid) && !empty($coursepanopto->sessiongroupid)) {
 
@@ -1026,6 +1055,8 @@ public static function get_import_target_list($courseid) {
 
     /**
      * Get ongoing Panopto sessions for the currently mapped course.
+     *
+     * @param string $sessionshavespecificorder session ordering
      */
     public function get_session_list($sessionshavespecificorder) {
         $sessionlist = array();
@@ -1040,6 +1071,7 @@ public function get_session_list($sessionshavespecificorder) {
 
     /**
      * Get a Panopto user by their user key
+     *
      * @param string $userkey the username/key for the user being searched.
      */
     public function get_user_by_key($userkey) {
@@ -1056,11 +1088,12 @@ public function get_user_by_key($userkey) {
 
     /**
      * Sends a request to Panopto to delete a user, requires the calling user to be an Admin in Panopto.
+     *
      * @param array $userids the Guid user Ids for the users being deleted.
      */
     public function delete_users_from_panopto($userids) {
         global $USER;
-        
+
         if (!empty($this->servername) && !empty($this->applicationkey)) {
             $this->ensure_user_manager($USER->username);
         }
@@ -1072,6 +1105,7 @@ public function delete_users_from_panopto($userids) {
 
     /**
      * Sends a request to Panopto to update the information of a user, assumes the user manager has already been ensured
+     *
      * @param string $userid the id of the target user;
      * @param string $firstname the new first name of the user
      * @param string $lastname the new last name of the user
@@ -1080,7 +1114,7 @@ public function delete_users_from_panopto($userids) {
      */
     public function update_contact_info($userid, $firstname, $lastname, $email, $sendemailnotifications) {
         global $USER;
-        
+
         if (!empty($this->servername) && !empty($this->applicationkey)) {
             $this->ensure_user_manager($USER->username);
         }
@@ -1088,7 +1122,7 @@ public function update_contact_info($userid, $firstname, $lastname, $email, $sen
         $result = $this->usermanager->update_contact_info(
             $userid,
             $firstname,
-            $lastname, 
+            $lastname,
             $email,
             $sendemailnotifications
         );
@@ -1106,7 +1140,8 @@ public function panopto_decorate_username($moodleusername) {
     }
 
     /**
-     * Lets us know if we have a value inside the config for a Panopto server, we don't want any of our events to fire on an unconfigured block.
+     * Lets us know if we have a value inside the config for a Panopto server,
+     * we don't want any of our events to fire on an unconfigured block.
      *
      */
     public static function is_main_block_configured() {
@@ -1267,6 +1302,7 @@ public static function get_course_role_mappings($moodlecourseid) {
      * @param int $sessiongroupid the id of the current session group.
      * @param int $servername name of the server the sessiongroup is located on.
      * @param int $appkey the appkey needed to access the Identity provider on the server.
+     * @param int $externalcourseid id of the external course.
      */
     public static function set_course_foldermap($moodlecourseid, $sessiongroupid, $servername, $appkey, $externalcourseid) {
         global $DB;
@@ -1288,8 +1324,8 @@ public static function set_course_foldermap($moodlecourseid, $sessiongroupid, $s
     }
 
     /**
-     *  Set the Panopto ID in the db for the current course
-     *  Called by Moodle block instance config save method, so must be static.
+     * Set the Panopto ID in the db for the current course
+     * Called by Moodle block instance config save method, so must be static.
      *
      * @param int $moodlecourseid id of the current Moodle course
      * @param int $sessiongroupid the id of the current session group
@@ -1387,6 +1423,7 @@ public static function set_course_role_mappings($moodlecourseid, $publisherroles
      * This function is unused but kept in case we decide to reintroduce the cleaning of table rows.
      *
      * @param int $moodlecourseid id of the target Moodle course
+     * @param bool $movetoinactivetable should we insert to inactive ClientData or not
      */
     public static function delete_panopto_relation($moodlecourseid, $movetoinactivetable) {
         global $DB;
@@ -1436,31 +1473,59 @@ public static function delete_panopto_relation($moodlecourseid, $movetoinactivet
         return $deletedrecords;
     }
 
+    /**
+     * Check if has valid panopto params
+     *
+     * @return bool
+     */
     public function has_valid_panopto() {
-        return isset($this->sessiongroupid) && !empty($this->sessiongroupid) && 
-               isset($this->servername) && !empty($this->servername) && 
+        return isset($this->sessiongroupid) && !empty($this->sessiongroupid) &&
+               isset($this->servername) && !empty($this->servername) &&
                isset($this->applicationkey) && !empty($this->applicationkey);
     }
 
     /**
-     * Get list of available folders from db based on user's access level on course. Only get unmapped folders, and the current course folder
+     * Get list of available folders from db based on user's access level on course.
+     * Only get unmapped folders, and the current course folder
+     *
+     * @return array
      */
     public function get_course_options() {
         global $DB;
 
         $panoptofolders = $this->get_creator_folders_list();
+        $options = array();
+        $containsmappedfolder = false;
+
         if (!empty($panoptofolders)) {
-            $options = array();
+
             foreach ($panoptofolders as $folderinfo) {
-                // Only add a folder to the course options if it is not already mapped to a course on moodle (unless its the current course)
-                if (!$DB->get_records('block_panopto_foldermap', array('panopto_id' => $folderinfo->Id)) || ($this->sessiongroupid === $folderinfo->Id)) {
+
+                // Only add a folder to the course options if it is not already mapped to a course on moodle.
+                // Unless its the current course.
+                if (!$DB->get_records('block_panopto_foldermap', array('panopto_id' => $folderinfo->Id)) 
+                    || ($this->sessiongroupid === $folderinfo->Id)) {
+
+                    if ($this->sessiongroupid === $folderinfo->Id) {
+                        $containsmappedfolder = true;
+                    }
+
                     $options[$folderinfo->Id] = $folderinfo->Name;
                 }
             }
-        } else if (isset($panoptofolders)) {
-            $options = array('Error' => '-- No Courses Available --');
-        } else {
-            $options = array('Error' => '!! Unable to retrieve course list !!');
+        }
+
+        if (!$containsmappedfolder && !empty($this->sessiongroupid)) {
+            $currentfolder = $this->get_folders_by_id_no_sync();
+            $options[$this->sessiongroupid] = $currentfolder->Name;
+        }
+
+        if (empty($options)) {
+            if (isset($panoptofolders) && empty($this->sessiongroupid)) {
+                $options = array('Error' => '-- No Courses Available --');
+            } else if (!isset($panoptofolders) && empty($this->sessiongroupid)) {
+                $options = array('Error' => '-- Unable to retrieve course list --');
+            }
         }
 
         return array('courses' => $options, 'selected' => $this->sessiongroupid);
@@ -1471,6 +1536,7 @@ public function get_course_options() {
      *
      * @param array $roles an array of roles to be given the capability
      * @param string $capability The capability being given to the roles
+     * @return array
      */
     public static function build_capability_to_roles($roles, $capability) {
         $assigncaps = array();
@@ -1489,6 +1555,7 @@ public static function build_capability_to_roles($roles, $capability) {
      * @param int $context the context of the roles being given the capability
      * @param array $roles an array of roles to be given the capability
      * @param string $capability The capability being given to the roles
+     * @return bool
      */
     public static function build_and_assign_context_capability_to_roles($context, $roles, $capability) {
         global $DB;
@@ -1498,14 +1565,15 @@ public static function build_and_assign_context_capability_to_roles($context, $r
         $existing = array();
 
         // Extract the existing capabilities that have been assigned for context, role and capability.
-        foreach ($roles as $key => $roleid) {
-            // Only query the DB if $roleid is not null
-            if ($roleid && $DB->record_exists('role_capabilities', array('contextid'=>$context->id, 'roleid'=>$roleid, 'capability'=>$capability))) {
+        foreach ($roles as $roleid) {
+            // Only query the DB if $roleid is not null.
+            if ($roleid && $DB->record_exists('role_capabilities',
+                array('contextid' => $context->id, 'roleid' => $roleid, 'capability' => $capability))) {
                 $existing[$roleid] = $capability;
             }
         }
 
-        // Remove existing capabilities that are no longer needed. This needs to be assoc to take into account the keys
+        // Remove existing capabilities that are no longer needed. This needs to be assoc to take into account the keys.
         $assignnew = array_diff_assoc($existing, $assigned);
         if (!empty($assignnew)) {
             foreach ($assignnew as $roleid => $cap) {
@@ -1559,16 +1627,22 @@ public static function set_course_role_permissions($courseid, $publisherroles, $
         self::set_course_role_mappings($courseid, $publisherroles, $creatorroles);
     }
 
-    // If a role was unset from a capability we need to reflect that change on Moodle.
+    /**
+     * If a role was unset from a capability we need to reflect that change on Moodle.
+     *
+     * @param int $courseid the id of the course being focused for this operation
+     * @param array $oldpublisherroles an array of roles to be made publishers
+     * @param array $oldcreatorroles an array of roles to be made creators for the course
+     */
     public static function unset_course_role_permissions($courseid, $oldpublisherroles, $oldcreatorroles) {
         $coursecontext = context_course::instance($courseid);
 
         foreach ($oldpublisherroles as $publisherrole) {
-                unassign_capability('block/panopto:provision_aspublisher', $publisherrole, $coursecontext);
+            unassign_capability('block/panopto:provision_aspublisher', $publisherrole, $coursecontext);
         }
 
         foreach ($oldcreatorroles as $creatorrole) {
-                unassign_capability('block/panopto:provision_asteacher', $creatorrole, $coursecontext);
+            unassign_capability('block/panopto:provision_asteacher', $creatorrole, $coursecontext);
         }
 
         if (!empty($oldpublisherroles) || !empty($oldcreatorroles)) {
@@ -1576,6 +1650,12 @@ public static function unset_course_role_permissions($courseid, $oldpublisherrol
         }
     }
 
+    /**
+     * Check to determine if server is live or not
+     *
+     * @param object $url server url
+     * @return bool
+     */
     public static function is_server_alive($url = null) {
         if ($url == null) {
             return false;
@@ -1615,6 +1695,11 @@ public static function is_server_alive($url = null) {
         return get_config('block_panopto', 'check_server_result');
     }
 
+    /**
+     * Print log
+     *
+     * @param string $logmessage log message
+     */
     public static function print_log($logmessage) {
         global $CFG;
 
@@ -1626,7 +1711,7 @@ public static function print_log($logmessage) {
             if (get_config('block_panopto', 'print_log_to_file')) {
                 $currenttime = time();
                 file_put_contents(
-                    $CFG->dirroot . '/PanoptoLogs.txt', date("Y-m-d-h:i:sA", $currenttime) . ": " . $logmessage . "\n", 
+                    $CFG->dirroot . '/PanoptoLogs.txt', date("Y-m-d-h:i:sA", $currenttime) . ": " . $logmessage . "\n",
                     FILE_APPEND
                 );
             } else {
@@ -1634,7 +1719,9 @@ public static function print_log($logmessage) {
 
                 // These flush's are needed for longer processes like the Moodle upgrade process and import process.
 
-                // If the oblength are false then there is no active outbut buffer, if we call ob_flush without an output buffer (e.g. from the cli) it will spit out an error. This doesn't break the execution of the script, but it's ugly and a lot of bloat.
+                // If the oblength are false then there is no active outbut buffer.
+                // If we call ob_flush without an output buffer (e.g. from the cli) it will spit out an error.
+                // This doesn't break the execution of the script, but it's ugly and a lot of bloat.
                 $obstatus = ob_get_status();
                 if (isset($obstatus) && !empty($obstatus)) {
                     ob_flush();
@@ -1644,6 +1731,11 @@ public static function print_log($logmessage) {
         }
     }
 
+    /**
+     * Print log level verbose
+     *
+     * @param string $logmessage log message
+     */
     public static function print_log_verbose($logmessage) {
         if (get_config('block_panopto', 'print_verbose_logs')) {
             self::print_log($logmessage);
diff --git a/lib/panopto_session_soap_client.php b/lib/panopto_session_soap_client.php
index ef40d5d..9af4e67 100644
--- a/lib/panopto_session_soap_client.php
+++ b/lib/panopto_session_soap_client.php
@@ -36,6 +36,13 @@
 require_once(dirname(__FILE__) . '/block_panopto_lib.php');
 require_once(dirname(__FILE__) . '/panopto_timeout_soap_client.php');
 
+/**
+ * Panopto session soap client class.
+ *
+ * @package block_panopto
+ * @copyright  Panopto 2009 - 2016
+ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
 class panopto_session_soap_client extends PanoptoTimeoutSoapClient {
     /**
      * @var array $authparam auth param needed for all soap calls.
@@ -68,12 +75,13 @@ class panopto_session_soap_client extends PanoptoTimeoutSoapClient {
     private $sessionmanagementserviceget;
 
     /**
-     * @var string PERSONAL_FOLDER_ERROR const string to return when user attempted to provision/sync a personal folder. This action is not supported.
+     * @var string PERSONAL_FOLDER_ERROR const string to return when user attempted to provision/sync a personal folder.
+     * This action is not supported.
      */
     const PERSONAL_FOLDER_ERROR = "TARGETED_PERSONAL_FOLDER";
 
     /**
-     * main constructor
+     * Main constructor
      *
      * @param string $servername
      * @param string $apiuseruserkey
@@ -88,12 +96,20 @@ public function __construct($servername, $apiuseruserkey, $apiuserauthcode) {
             $apiuseruserkey
         );
 
-        $this->serviceparams = panopto_generate_wsdl_service_params('https://'. $servername . '/Panopto/PublicAPI/4.6/SessionManagement.svc?singlewsdl');
+        $this->serviceparams =
+            panopto_generate_wsdl_service_params('https://'. $servername . '/Panopto/PublicAPI/4.6/SessionManagement.svc?singlewsdl');
     }
 
-    // Possibly unneeded since Moodle won't support multiple folders without behavior change.
+    /**
+     * Add folder
+     * Note: Possibly unneeded since Moodle won't support multiple folders without behavior change
+     *
+     * @param string $foldername folder name to be created
+     * @param array $parentguids parent ids
+     * @param bool $ispublic is folder public or not
+     */
     public function add_folder($foldername, $parentguids = null, $ispublic = false) {
-        
+
         if (!isset($this->sessionmanagementserviceadd)) {
             $this->sessionmanagementserviceadd = new SessionManagementServiceAdd($this->serviceparams);
         }
@@ -114,13 +130,13 @@ public function add_folder($foldername, $parentguids = null, $ispublic = false)
         }
     }
 
-    /* 
-     * This function wraps the API call to unprovision a course from Panopto 
+    /**
+     * This function wraps the API call to unprovision a course from Panopto
      *
      * @param int $externalid string the externalId we are finding in Panopto to unmap
-     */ 
+     */
     public function unprovision_external_course($externalid) {
-        
+
         if (!isset($this->sessionmanagementserviceunprovision)) {
             $this->sessionmanagementserviceunprovision = new SessionManagementServiceUnprovision($this->serviceparams);
         }
@@ -129,18 +145,25 @@ public function unprovision_external_course($externalid) {
             $this->authparam,
             $externalid
         );
-        
+
         if ($this->sessionmanagementserviceunprovision->UnprovisionExternalCourse($unprovisionexternalcourseparams)) {
             return  $this->sessionmanagementserviceunprovision->getResult()->UnprovisionExternalCourseResult;
         } else {
             return $this->handle_error(
-                $this->sessionmanagementserviceunprovision->getLastError()['SessionManagementServiceUnprovision::UnprovisionExternalCourse']
+                $this->sessionmanagementserviceunprovision
+                    ->getLastError()['SessionManagementServiceUnprovision::UnprovisionExternalCourse']
             );
         }
     }
 
+    /**
+     * Provision external course with roles
+     *
+     * @param string $fullname full name of the course
+     * @param int $externalcourseid id of the external course
+     */
     public function provision_external_course_with_roles($fullname, $externalcourseid) {
-        
+
         if (!isset($this->sessionmanagementserviceprovision)) {
             $this->sessionmanagementserviceprovision = new SessionManagementServiceProvision($this->serviceparams);
         }
@@ -164,13 +187,21 @@ public function provision_external_course_with_roles($fullname, $externalcoursei
             return $retobj->ProvisionExternalCourseWithRolesResult;
         } else {
             return $this->handle_error(
-                $this->sessionmanagementserviceprovision->getLastError()['SessionManagementServiceProvision::ProvisionExternalCourseWithRoles']
+                $this->sessionmanagementserviceprovision
+                    ->getLastError()['SessionManagementServiceProvision::ProvisionExternalCourseWithRoles']
             );
         }
     }
 
+    /**
+     * Set external course access for roles
+     *
+     * @param string $fullname full name of the course
+     * @param int $externalcourseid id of the external course
+     * @param array $folderids ids of folders
+     */
     public function set_external_course_access_for_roles($fullname, $externalcourseid, $folderids) {
-        
+
         if (!isset($this->sessionmanagementserviceset)) {
             $this->sessionmanagementserviceset = new SessionManagementServiceSet($this->serviceparams);
         }
@@ -207,8 +238,15 @@ public function set_external_course_access_for_roles($fullname, $externalcoursei
         }
     }
 
+    /**
+     * Set copied external course access for roles
+     *
+     * @param string $fullname full name of the course
+     * @param int $externalcourseid id of the external course
+     * @param array $folderids ids of folders
+     */
     public function set_copied_external_course_access_for_roles($fullname, $externalcourseid, $folderids) {
-        
+
         if (!isset($this->sessionmanagementserviceset)) {
             $this->sessionmanagementserviceset = new SessionManagementServiceSet($this->serviceparams);
         }
@@ -239,13 +277,19 @@ public function set_copied_external_course_access_for_roles($fullname, $external
             return $retobj->SetCopiedExternalCourseAccessForRolesResult->Folder[0];
         } else {
             return $this->handle_error(
-                $this->sessionmanagementserviceset->getLastError()['SessionManagementServiceSet::SetCopiedExternalCourseAccessForRoles']
+                $this->sessionmanagementserviceset
+                    ->getLastError()['SessionManagementServiceSet::SetCopiedExternalCourseAccessForRoles']
             );
         }
     }
 
+    /**
+     * Get folders by id
+     *
+     * @param array $folderids ids of folders
+     */
     public function get_folders_by_id($folderids) {
-        
+
         if (!isset($this->sessionmanagementserviceget)) {
             $this->sessionmanagementserviceget = new SessionManagementServiceGet($this->serviceparams);
         }
@@ -267,8 +311,13 @@ public function get_folders_by_id($folderids) {
         }
     }
 
+    /**
+     * Get folders by external id
+     *
+     * @param array $folderids ids of folders
+     */
     public function get_folders_by_external_id($folderids) {
-        
+
         if (!isset($this->sessionmanagementserviceget)) {
             $this->sessionmanagementserviceget = new SessionManagementServiceGet($this->serviceparams);
         }
@@ -284,7 +333,7 @@ public function get_folders_by_external_id($folderids) {
             $folderidlist
         );
 
-        if ($this->sessionmanagementserviceget->GetFoldersByExternalId()) {
+        if ($this->sessionmanagementserviceget->GetFoldersByExternalId($getfolderparams)) {
             $retobj = $this->sessionmanagementserviceget->getResult();
             return $retobj->GetFoldersByExternalIdResult->Folder[0];
         } else {
@@ -294,11 +343,11 @@ public function get_folders_by_external_id($folderids) {
         }
     }
 
-    /** 
+    /**
      * Attempts to get all folders the user has creator access to.
-     */ 
+     */
     public function get_creator_folders_list() {
-        
+
         if (!isset($this->sessionmanagementserviceget)) {
             $this->sessionmanagementserviceget = new SessionManagementServiceGet($this->serviceparams);
         }
@@ -383,11 +432,11 @@ public function get_creator_folders_list() {
         }
     }
 
-    /** 
+    /**
      * Attempts to get all folders the user has access to.
-     */ 
+     */
     public function get_folders_list() {
-        
+
         if (!isset($this->sessionmanagementserviceget)) {
             $this->sessionmanagementserviceget = new SessionManagementServiceGet($this->serviceparams);
         }
@@ -467,8 +516,14 @@ public function get_folders_list() {
         }
     }
 
+    /**
+     * Get session list
+     *
+     * @param int $folderid id of the folder
+     * @param bool $sessionshavespecificorder order of the sessions
+     */
     public function get_session_list($folderid, $sessionshavespecificorder) {
-        
+
         if (!isset($this->sessionmanagementserviceget)) {
             $this->sessionmanagementserviceget = new SessionManagementServiceGet($this->serviceparams);
         }
@@ -478,7 +533,9 @@ public function get_session_list($folderid, $sessionshavespecificorder) {
         $pagination = new SessionManagementStructPagination(100, 0);
         $remoterecorderid = null;
 
-        $sortby = $sessionshavespecificorder ? SessionManagementEnumSessionSortField::VALUE_ORDER : SessionManagementEnumSessionSortField::VALUE_DATE;
+        $sortby = $sessionshavespecificorder
+            ? SessionManagementEnumSessionSortField::VALUE_ORDER
+            : SessionManagementEnumSessionSortField::VALUE_DATE;
         $sortincreasing = $sessionshavespecificorder;
         $states = new SessionManagementStructArrayOfSessionState(
             array(
@@ -515,15 +572,20 @@ public function get_session_list($folderid, $sessionshavespecificorder) {
         }
     }
 
+    /**
+     * Ensure external hierarchy by branch
+     *
+     * @param object $categorybranchinfo category branch info
+     */
     public function ensure_category_branch($categorybranchinfo) {
-        
+
         if (!isset($this->sessionmanagementserviceensure)) {
             $this->sessionmanagementserviceensure = new SessionManagementServiceEnsure($this->serviceparams);
         }
 
         $brancharrayofcategoryinfos = new SessionManagementStructArrayOfExternalHierarchyInfo($categorybranchinfo);
         $ensurecategorybranchparams = new SessionManagementStructEnsureExternalHierarchyBranch(
-            $this->authparam, 
+            $this->authparam,
             $brancharrayofcategoryinfos
         );
 
@@ -531,20 +593,27 @@ public function ensure_category_branch($categorybranchinfo) {
             return $this->sessionmanagementserviceensure->getResult()->EnsureExternalHierarchyBranchResult;
         } else {
             return $this->handle_error(
-                $this->sessionmanagementserviceensure->getLastError()['SessionManagementServiceEnsure::EnsureExternalHierarchyBranch']
+                $this->sessionmanagementserviceensure
+                    ->getLastError()['SessionManagementServiceEnsure::EnsureExternalHierarchyBranch']
             );
         }
     }
 
+    /**
+     * Update folder parent
+     *
+     * @param int $folderid id of the folder
+     * @param int $newparentid id of the new folder parent
+     */
     public function update_folder_parent($folderid, $newparentid) {
-        
+
         if (!isset($this->sessionmanagementserviceupdate)) {
             $this->sessionmanagementserviceupdate = new SessionManagementServiceUpdate($this->serviceparams);
         }
 
         $updatefolderparentparams = new SessionManagementStructUpdateFolderParent(
-            $this->authparam, 
-            $folderid, 
+            $this->authparam,
+            $folderid,
             $newparentid
         );
 
@@ -557,15 +626,22 @@ public function update_folder_parent($folderid, $newparentid) {
         }
     }
 
+    /**
+     * Update folder external id with provider
+     *
+     * @param int $folderid id of the folder
+     * @param int $externalid external folder id
+     * @param int $providername provider name
+     */
     public function update_folder_external_id_with_provider($folderid, $externalid, $providername) {
-        
+
         if (!isset($this->sessionmanagementserviceupdate)) {
             $this->sessionmanagementserviceupdate = new SessionManagementServiceUpdate($this->serviceparams);
         }
 
         $updatefolderparams = new SessionManagementStructUpdateFolderExternalIdWithProvider(
-            $this->authparam, 
-            $folderid, 
+            $this->authparam,
+            $folderid,
             $externalid,
             $providername
         );
@@ -574,20 +650,27 @@ public function update_folder_external_id_with_provider($folderid, $externalid,
             return true;
         } else {
             return $this->handle_error(
-                $this->sessionmanagementserviceupdate->getLastError()['SessionManagementServiceUpdate::UpdateFolderExternalIdWithProvider']
+                $this->sessionmanagementserviceupdate
+                    ->getLastError()['SessionManagementServiceUpdate::UpdateFolderExternalIdWithProvider']
             );
         }
     }
 
+    /**
+     * Update folder name
+     *
+     * @param int $folderid id of the folder
+     * @param int $newname new name of the folder
+     */
     public function update_folder_name($folderid, $newname) {
-        
+
         if (!isset($this->sessionmanagementserviceupdate)) {
             $this->sessionmanagementserviceupdate = new SessionManagementServiceUpdate($this->serviceparams);
         }
 
         $updatefoldernameparams = new SessionManagementStructUpdateFolderName(
-            $this->authparam, 
-            $folderid, 
+            $this->authparam,
+            $folderid,
             $newname
         );
 
@@ -601,6 +684,11 @@ public function update_folder_name($folderid, $newname) {
         }
     }
 
+    /**
+     * Get recorder download urls
+     *
+     * @return array
+     */
     public function get_recorder_download_urls() {
         if (!isset($this->sessionmanagementserviceget)) {
             $this->sessionmanagementserviceget = new SessionManagementServiceGet($this->serviceparams);
@@ -615,11 +703,14 @@ public function get_recorder_download_urls() {
         }
     }
 
+    /**
+     * Handle error
+     *
+     * @param string $lasterror last error message
+     */
     private function handle_error($lasterror) {
         $ret = new stdClass;
         $ret->errormessage = $lasterror->getMessage();
-        
-        
 
         if (!empty($ret->errormessage)) {
             if (strpos($ret->errormessage, 'not found') !== false) {
@@ -629,10 +720,10 @@ private function handle_error($lasterror) {
             if (strpos($ret->errormessage, 'not have access') !== false) {
                 $ret->noaccess = true;
             }
-            
+
             \panopto_data::print_log($ret->errormessage);
         } else {
-            \panopto_data::print_log(print_r($lasterror, true));
+            \panopto_data::print_log(var_export($lasterror, true));
         }
 
         return $ret;
diff --git a/lib/panopto_timeout_soap_client.php b/lib/panopto_timeout_soap_client.php
index bbee79e..fbd090f 100644
--- a/lib/panopto_timeout_soap_client.php
+++ b/lib/panopto_timeout_soap_client.php
@@ -24,74 +24,122 @@
 
 // This can't be defined Moodle internal because it is called from Panopto to authorize login.
 
-class PanoptoTimeoutSoapClient extends SoapClient
-{
+/**
+ * Panopto timeout soap client class.
+ *
+ * @package block_panopto
+ * @copyright  Panopto 2009 - 2016
+ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+class PanoptoTimeoutSoapClient extends SoapClient {
+    /**
+     * @var int $socket_timeout socket timeout
+     */
     private $socket_timeout;
+
+    /**
+     * @var int $connect_timeout connection timeout
+     */
     private $connect_timeout;
+
+    /**
+     * @var string $proxy_host proxy host
+     */
     private $proxy_host;
+
+    /**
+     * @var int $proxy_port proxy port
+     */
     private $proxy_port;
+
+    /**
+     * @var array $panoptocookies Panopto cookies
+     */
     private $panoptocookies;
 
-    public function __setConnectionTimeout($connect_timeout)
-    {
+    /**
+     * Set connection timeout
+     *
+     * @param int $connect_timeout
+     */
+    public function __setConnectionTimeout($connect_timeout) {
         $connect_timeout = intval($connect_timeout);
 
-        if (!is_null($connect_timeout) && !is_int($connect_timeout))
-        {
+        if (!is_null($connect_timeout) && !is_int($connect_timeout)) {
             throw new Exception("Invalid connection timeout value");
         }
 
         $this->connect_timeout = $connect_timeout;
     }
 
-    public function __setSocketTimeout($socket_timeout)
-    {
+    /**
+     * Set socket timeout
+     *
+     * @param int $socket_timeout
+     */
+    public function __setSocketTimeout($socket_timeout) {
         $socket_timeout = intval($socket_timeout);
 
-        if (!is_null($socket_timeout) && !is_int($socket_timeout))
-        {
+        if (!is_null($socket_timeout) && !is_int($socket_timeout)) {
             throw new Exception("Invalid socket timeout value");
         }
 
         $this->socket_timeout = $socket_timeout;
     }
 
+    /**
+     * Set proxy host
+     *
+     * @param string $proxy_host
+     */
     public function __setProxyHost($proxy_host) {
         $this->proxy_host = $proxy_host;
     }
 
+    /**
+     * Set proxy port
+     *
+     * @param int $proxy_port
+     */
     public function __setProxyPort($proxy_port) {
         $this->proxy_port = $proxy_port;
     }
 
-    public function getpanoptocookies() 
-    {
+    /**
+     * Set Panopto cookies
+     */
+    public function getpanoptocookies() {
         return $this->panoptocookies;
     }
 
-    public function __doRequest($request, $location, $action, $version, $one_way = FALSE)
-    {
-        if (empty($this->socket_timeout) && empty($this->connect_timeout))
-        {
-            // Call via parent because we require no timeout
+    /**
+     * Create a SOAP request
+     *
+     * @param string $request XML SOAP request
+     * @param string $location the URL to request
+     * @param string $action the SOAP action
+     * @param int $version the SOAP version
+     * @param bool $one_way determine if response is expected or not
+     */
+    public function __doRequest($request, $location, $action, $version, $one_way = false) {
+        if (empty($this->socket_timeout) && empty($this->connect_timeout)) {
+            // Call via parent because we require no timeout.
             $response = parent::__doRequest($request, $location, $action, $version, $one_way);
 
             $lastresponseheaders = $this->__getLastResponseHeaders();
             preg_match_all('/^Set-Cookie:\s*([^;]*)/mi', $lastresponseheaders, $matches);
             $this->panoptocookies = array();
-            foreach($matches[1] as $item) {
+            foreach ($matches[1] as $item) {
                 parse_str($item, $cookie);
                 $this->panoptocookies = array_merge($this->panoptocookies, $cookie);
             }
-        }
-        else
-        {
+        } else {
 
             $curl = new \curl();
             $options = [
-                'CURLOPT_VERBOSE' => FALSE,
-                'CURLOPT_RETURNTRANSFER' => TRUE,
-                'CURLOPT_HEADER' => TRUE,
+                'CURLOPT_VERBOSE' => false,
+                'CURLOPT_RETURNTRANSFER' => true,
+                'CURLOPT_HEADER' => true,
                 'CURLOPT_HTTPHEADER' => array('Content-Type: text/xml',
                                               'SoapAction: ' . $action)
             ];
@@ -100,46 +148,43 @@ public function __doRequest($request, $location, $action, $version, $one_way = F
                 $options['CURLOPT_TIMEOUT'] = $this->socket_timeout;
             }
 
-            if(!is_null($this->connect_timeout)) {
+            if (!is_null($this->connect_timeout)) {
                 $options['CURLOPT_CONNECTTIMEOUT'] = $this->connect_timeout;
             }
 
-            if(!empty($this->proxy_host)) {
+            if (!empty($this->proxy_host)) {
                 $options['CURLOPT_PROXY'] = $this->proxy_host;
             }
 
-            if(!empty($this->proxy_port)) {
+            if (!empty($this->proxy_port)) {
                 $options['CURLOPT_PROXYPORT'] = $this->proxy_port;
             }
-            
+
             $response = $curl->post($location, $request, $options);
 
-            // get cookies
-            $actualresponseheaders = (isset($curl->info["header_size"]))?substr($response,0,$curl->info["header_size"]):"";
+            // Get cookies.
+            $actualresponseheaders = (isset($curl->info["header_size"])) ? substr($response, 0, $curl->info["header_size"]) : "";
             preg_match_all('/^Set-Cookie:\s*([^;]*)/mi', $actualresponseheaders, $matches);
             $this->panoptocookies = array();
-            foreach($matches[1] as $item) {
+            foreach ($matches[1] as $item) {
                 parse_str($item, $cookie);
                 $this->panoptocookies = array_merge($this->panoptocookies, $cookie);
             }
 
-            $actualResponse = (isset($curl->info["header_size"]))?substr($response,$curl->info["header_size"]):"";
+            $actualresponse = (isset($curl->info["header_size"])) ? substr($response, $curl->info["header_size"]) : "";
 
             if ($curl->get_errno()) {
                 throw new Exception($response);
             }
 
-            $response = $actualResponse;
+            $response = $actualresponse;
         }
 
         // Return?
-        if (!$one_way)
-        {
+        if (!$one_way) {
             return $response;
         }
     }
 }
 
-
-
-/* End of file panopto_timeout_soap_client.php */
\ No newline at end of file
+/* End of file panopto_timeout_soap_client.php */
diff --git a/lib/panopto_user_soap_client.php b/lib/panopto_user_soap_client.php
index a66302a..0d91ac0 100644
--- a/lib/panopto_user_soap_client.php
+++ b/lib/panopto_user_soap_client.php
@@ -36,6 +36,13 @@
 require_once(dirname(__FILE__) . '/block_panopto_lib.php');
 require_once(dirname(__FILE__) . '/panopto_timeout_soap_client.php');
 
+/**
+ * Panopto user SOAP client
+ *
+ * @package block_panopto
+ * @copyright  Panopto 2009 - 2015
+ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
 class panopto_user_soap_client extends PanoptoTimeoutSoapClient {
     /**
      * @var array $authparam
@@ -63,7 +70,7 @@ class panopto_user_soap_client extends PanoptoTimeoutSoapClient {
     private $usermanagementservicecreate;
 
     /**
-     * main constructor
+     * Main constructor
      *
      * @param string $servername
      * @param string $apiuseruserkey
@@ -77,7 +84,8 @@ public function __construct($servername, $apiuseruserkey, $apiuserauthcode) {
             null,
             $apiuseruserkey);
 
-        $this->serviceparams = panopto_generate_wsdl_service_params('https://'. $servername . '/Panopto/PublicAPI/4.6/UserManagement.svc?singlewsdl');
+        $this->serviceparams =
+            panopto_generate_wsdl_service_params('https://'. $servername . '/Panopto/PublicAPI/4.6/UserManagement.svc?singlewsdl');
 
         // We need to make sure the UpdateContactInfo call succeeded so we need to ensure SOAP_WAIT_ONE_WAY_CALLS is set.
         $this->serviceparams['wsdl_features'] = SOAP_WAIT_ONE_WAY_CALLS | SOAP_SINGLE_ELEMENT_ARRAYS | SOAP_USE_XSI_ARRAY_TYPE;
@@ -110,7 +118,7 @@ public function sync_external_user($firstname, $lastname, $email, $externalgroup
 
         // Returns false if the call failed.
         if (!$this->usermanagementservicesync->SyncExternalUser($syncparamsobject)) {
-            \panopto_data::print_log(print_r($this->usermanagementservicesync->getLastError(), true));
+            \panopto_data::print_log(var_export($this->usermanagementservicesync->getLastError(), true));
         }
     }
 
@@ -136,7 +144,7 @@ public function get_user_by_key($userkey) {
             $result = $this->usermanagementserviceget->getResult()->GetUserByKeyResult;
         } else {
             $lasterror = $this->usermanagementserviceget->getLastError()['UserManagementServiceGet::GetUserByKey'];
-            \panopto_data::print_log(print_r($lasterror, true));
+            \panopto_data::print_log(var_export($lasterror, true));
             throw $lasterror;
         }
         return $result;
@@ -154,7 +162,7 @@ public function get_user_by_key($userkey) {
      * @param string $userbio a new user information
      * @param string $userid the target id of the new user
      * @param string $userkey the target username/key of the new user
-     * @param string $usersettingsurl 
+     * @param string $usersettingsurl
      * @param string $password the password for the new user
      */
     public function create_user($email, $emailsessionnotifications, $firstname, $groupmemberships,
@@ -189,7 +197,7 @@ public function create_user($email, $emailsessionnotifications, $firstname, $gro
         if ($this->usermanagementservicecreate->CreateUser($createuserparams)) {
             $result = $this->usermanagementservicecreate->getResult();
         } else {
-            \panopto_data::print_log(print_r($this->usermanagementservicecreate->getLastError(), true));
+            \panopto_data::print_log(var_export($this->usermanagementservicecreate->getLastError(), true));
         }
 
         return $result;
@@ -225,7 +233,7 @@ public function update_contact_info($userid, $firstname, $lastname, $email, $sen
             $result = $this->usermanagementserviceupdate->getResult();
         } else {
             $lasterror = $this->usermanagementserviceupdate->getLastError()['UserManagementServiceUpdate::UpdateContactInfo'];
-            \panopto_data::print_log(print_r($lasterror, true));
+            \panopto_data::print_log(var_export($lasterror, true));
             throw $lasterror;
         }
 
@@ -246,14 +254,14 @@ public function delete_users($userids) {
 
         $arrayofuserids = new UserManagementStructArrayOfguid($userids);
         $deleteusersparams = new UserManagementStructDeleteUsers(
-            $this->authparam, 
+            $this->authparam,
             $arrayofuserids
         );
 
         if ($this->usermanagementservicedelete->DeleteUsers($deleteusersparams)) {
             $result = $this->usermanagementservicedelete->getResult();
         } else {
-            \panopto_data::print_log(print_r($this->usermanagementservicedelete->getLastError(), true));
+            \panopto_data::print_log(var_export($this->usermanagementservicedelete->getLastError(), true));
         }
 
         return $result;
diff --git a/lib/panoptoblock_lti_utility.php b/lib/panoptoblock_lti_utility.php
index 289877a..67be65b 100644
--- a/lib/panoptoblock_lti_utility.php
+++ b/lib/panoptoblock_lti_utility.php
@@ -17,7 +17,7 @@
 /**
  * Panopto lti helper object. Contains info required for Panopto LTI tools to be used in text editors
  *
- * @package mod_panoptocourseembed
+ * @package block_panopto
  * @copyright  Panopto 2021
  * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
@@ -25,22 +25,22 @@ class panoptoblock_lti_utility {
 
     /**
      * Get the id of the pre-configured LTI tool that matched the Panopto server a course is provisioned to.
-     *  If multiple LTI tools are configured to a single server this will get the first one. 
+     * If multiple LTI tools are configured to a single server this will get the first one.
      *
-     * @param int $courseid - the id of the course we are targetting in moodle.
-     * @return int the id of the first matching tool 
-     */ 
+     * @param int $courseid - the id of the course we are targeting in moodle.
+     * @return int the id of the first matching tool
+     */
     public static function get_course_tool($courseid) {
         global $DB;
         require_once(dirname(dirname(dirname(dirname(__FILE__)))) . '/mod/lti/locallib.php');
-        
+
         $ltitooltypes = $DB->get_records('lti_types', null, 'name');
-        
+
         $targetservername = null;
 
         $blockexists = $DB->get_record('block', array('name' => 'panopto'), 'name');
         if (!empty($blockexists)) {
-           $targetservername = $DB->get_field('block_panopto_foldermap', 'panopto_server', array('moodleid' => $courseid));
+            $targetservername = $DB->get_field('block_panopto_foldermap', 'panopto_server', array('moodleid' => $courseid));
         }
 
         // If the course if not provisioned with the Panopto block then get the default panopto server fqdn.
@@ -56,11 +56,11 @@ public static function get_course_tool($courseid) {
                 ]
             );
 
-            if (!empty($targetservername) && strpos($type->config['toolurl'], $targetservername) !== false && 
+            if (!empty($targetservername) && strpos($type->config['toolurl'], $targetservername) !== false &&
                 $type->state == LTI_TOOL_STATE_CONFIGURED) {
                 $currentconfig = lti_get_type_config($type->id);
 
-                if(!empty($currentconfig['customparameters']) && 
+                if (!empty($currentconfig['customparameters']) &&
                     strpos($currentconfig['customparameters'], 'panopto_course_embed_tool') !== false) {
                     return $type;
                 }
diff --git a/panopto_content.php b/panopto_content.php
index b6e0acf..0afebd1 100644
--- a/panopto_content.php
+++ b/panopto_content.php
@@ -15,7 +15,7 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * manages the content on the Panopto block
+ * Manages the content on the Panopto block
  *
  * @package block_panopto
  * @copyright  Panopto 2009 - 2016 /With contributions from Spenser Jones (sjones@ambrose.edu)
@@ -23,11 +23,8 @@
  */
 
 define('AJAX_SCRIPT', true);
-global $CFG;
-if (empty($CFG)) {
-    require_once(dirname(__FILE__) . '/../../config.php');
-}
 
+require_once(dirname(__FILE__) . '/../../config.php');
 require_once(dirname(__FILE__) . '/lib/panopto_data.php');
 
 try {
@@ -37,9 +34,9 @@
     require_sesskey();
     header('Content-Type: text/html; charset=utf-8');
     global $CFG, $USER;
-    
+
     $content = new stdClass;
-    
+
     // Close the session so that the users other tabs in the same session are not blocked.
     \core\session\manager::write_close();
     $content->text = '';
@@ -50,13 +47,13 @@
 
     $allowautoprovision = get_config('block_panopto', 'auto_provision_new_courses');
     $usercanprovision = $panoptodata->can_user_provision($courseid);
-    
-    if ((empty($panoptodata->servername) || 
-        empty($panoptodata->instancename) || 
+
+    if ((empty($panoptodata->servername) ||
+        empty($panoptodata->instancename) ||
         empty($panoptodata->applicationkey)) &&
         $usercanprovision &&
         ($allowautoprovision == 'onblockview')) {
-        
+
         $task = new \block_panopto\task\provision_course();
         $task->set_custom_data(array(
             'courseid' => $courseid
@@ -80,7 +77,8 @@
     }
 
 
-    if (!$failedautoprovisioning && (empty($panoptodata->servername) || empty($panoptodata->instancename) || empty($panoptodata->applicationkey))) {
+    if (!$failedautoprovisioning && (empty($panoptodata->servername) ||
+        empty($panoptodata->instancename) || empty($panoptodata->applicationkey))) {
         $content->text = get_string('unprovisioned', 'block_panopto');
 
         if ($usercanprovision) {
@@ -108,17 +106,14 @@
                 if (isset($courseinfo->noaccess) && $courseinfo->noaccess == true) {
                     // The user did not have access to the Panopto content.
                     $content->text .= "<span class='error'>" . get_string('no_access', 'block_panopto') . '</span>';
-                } 
-                else if (!empty($courseinfo->errormessage)) { 
-                    // We failed for some other reason, display the error. 
+                } else if (!empty($courseinfo->errormessage)) {
+                    // We failed for some other reason, display the error.
                     $content->text .= "<span class='error'>" . $courseinfo->errormessage . '</span>';
-                } 
-                else {
+                } else {
                     // SSO form passes instance name in POST to keep URLs portable.
                     $content->text .= "<form name='SSO' method='post'>" .
                         "<input type='hidden' name='instance' value='$panoptodata->instancename' /></form>";
 
-
                     // Get all Completed.
                     $sessionlist = $panoptodata->get_session_list($courseinfo->DeliveriesHaveSpecifiedOrder);
                     $livesessions = array();
@@ -126,7 +121,8 @@
                     if (is_array($sessionlist) && !empty($sessionlist)) {
                         foreach ($sessionlist as $sessionobj) {
 
-                            // If the session is a live broadcast from the Windows/Mac Recorder or Remote Recorder check if its live
+                            // If the session is a live broadcast from the Windows/Mac Recorder
+                            // or Remote Recorder check if its live.
                             $islivesession = $sessionobj->State === 'Broadcasting';
 
                             if ($islivesession) {
@@ -172,25 +168,30 @@
                         $i = 0;
 
                         if (!function_exists('str_contains')) {
-                            function str_contains(string $haystack, string $needle): bool
-                            {
+                            /**
+                             * Check if string contains
+                             *
+                             * @param string $haystack
+                             * @param string $needle
+                             * @return bool
+                             */
+                            function str_contains(string $haystack, string $needle): bool {
                                 return '' === $needle || false !== strpos($haystack, $needle);
                             }
                         }
-                        
+
                         foreach ($completeddeliveries as $completeddelivery) {
                             // Collapse to 3 lectures by default.
                             if ($i == 3) {
                                 $content->text .= "<div id='hiddenLecturesDiv'>";
                             }
 
-                            if (!str_contains($completeddelivery->ViewerUrl, '?instance') && 
+                            if (!str_contains($completeddelivery->ViewerUrl, '?instance') &&
                                 !str_contains($completeddelivery->ViewerUrl, '&instance')) {
                                 if (str_contains($completeddelivery->ViewerUrl, '?')) {
-                                    $completeddelivery->ViewerUrl .= '&instance=' . $panoptodata->instancename; 
-                                } 
-                                else {
-                                    $completeddelivery->ViewerUrl .= '?instance=' . $panoptodata->instancename; 
+                                    $completeddelivery->ViewerUrl .= '&instance=' . $panoptodata->instancename;
+                                } else {
+                                    $completeddelivery->ViewerUrl .= '?instance=' . $panoptodata->instancename;
                                 }
                             }
 
@@ -248,8 +249,10 @@ function str_contains(string $haystack, string $needle): bool
 
                     $hascreatoraccess = has_capability('block/panopto:provision_asteacher', $context, $USER->id);
 
-                    // Settings link can only be viewed by Teachers, Admins. If the proper setting is enabled, any creators can also view the link.
-                    if ($hascreatoraccess && ($isteacheroradmin || get_config('block_panopto', 'any_creator_can_view_folder_settings'))) {
+                    // Settings link can only be viewed by Teachers, Admins. If the proper setting is enabled,
+                    // any creators can also view the link.
+                    if ($hascreatoraccess && ($isteacheroradmin ||
+                        get_config('block_panopto', 'any_creator_can_view_folder_settings'))) {
                         $content->text .= "<div class='sectionHeader'><b>" . get_string('links', 'block_panopto') .
                             '</b></div>' .
                             "<div class='listItem'>" .
diff --git a/provision_course.php b/provision_course.php
index 5ce978b..f623fc7 100644
--- a/provision_course.php
+++ b/provision_course.php
@@ -15,7 +15,7 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * the provision course logic for Panopto
+ * The provision course logic for Panopto
  *
  * @package block_panopto
  * @copyright  Panopto 2009 - 2016 /With contributions from Spenser Jones (sjones@ambrose.edu)
@@ -155,10 +155,12 @@
                 $provisioneddata = $panoptodata->provision_course($provisioningdata, false);
                 include('views/provisioned_course.html.php');
             } else if ($coursecount == 1) {
-                // If there is only one course in the count and the server info is invalid redirect to the form for manual provisioning.
+                // If there is only one course in the count and the server info is invalid redirect
+                // to the form for manual provisioning.
                 $mform->display();
             } else {
-                // For some reason the server name or application key are invalid and we can't redirect to the form since there are multiple courses, let the user know.
+                // For some reason the server name or application key are invalid and we can't redirect
+                // to the form since there are multiple courses, let the user know.
                 echo "<div class='block_panopto'>" .
                         "<div class='panoptoProcessInformation'>" .
                             "<div class='errorMessage'>" . get_string('server_info_not_valid', 'block_panopto') . "</div>" .
diff --git a/provision_course_internal.php b/provision_course_internal.php
index 35384fb..a29777c 100644
--- a/provision_course_internal.php
+++ b/provision_course_internal.php
@@ -51,14 +51,14 @@
 
     $hasservername = !panopto_is_string_empty($thisservername);
     if ($hasservername && !panopto_is_string_empty($thisappkey)) {
-        // array reference so we should substract 1 to start at 0.
+        // Array reference so we should substract 1 to start at 0.
         $aserverarray[$serverwalker - 1] = $thisservername;
         $appkeyarray[$serverwalker - 1] = $thisappkey;
     }
 }
 
-// If only one server, simply provision with that server. Setting these values will circumvent loading the selection form
-// prior to provisioning.
+// If only one server, simply provision with that server.
+// Setting these values will circumvent loading the selection form prior to provisioning.
 if (count($aserverarray) == 1) {
     // Get first element from associative array. aServerArray and appKeyArray will have same key values.
     $key = array_keys($aserverarray);
@@ -69,7 +69,8 @@
 require_login();
 
 
-// This page requires a course ID to be passed in as a param. If accessed directly without clicking on a link for the course,
+// This page requires a course ID to be passed in as a param.
+// If accessed directly without clicking on a link for the course,
 // no id is passed and the script fails. Similarly if no ID is passed with via a link (should never happen) the script will fail.
 $courseid = required_param('id', PARAM_INT);
 
@@ -106,7 +107,6 @@
     redirect(new moodle_url($returnurl));
 } else if ($data = $mform->get_data()) {
     // If data has been submitted use it then lose it for next time.
-
     $selectedserver = trim($aserverarray[$data->servers]);
     $selectedkey = trim($appkeyarray[$data->servers]);
 
diff --git a/reinitialize_imports.php b/reinitialize_imports.php
index 68458c9..add094d 100644
--- a/reinitialize_imports.php
+++ b/reinitialize_imports.php
@@ -14,13 +14,6 @@
 // You should have received a copy of the GNU General Public License
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
-/**
- * the reinitialize imports logic for Panopto
- *
- * @package block_panopto
- * @copyright  Panopto 2009 - 2017
- * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
 global $CFG;
 if (empty($CFG)) {
     require_once(dirname(__FILE__) . '/../../config.php');
@@ -29,6 +22,13 @@
 require_once($CFG->libdir . '/formslib.php');
 require_once(dirname(__FILE__) . '/lib/panopto_data.php');
 
+/**
+ * The reinitialize imports logic for Panopto
+ *
+ * @package block_panopto
+ * @copyright  Panopto 2020
+ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
 class panopto_reinitialize_imports_form extends moodleform {
 
     /**
@@ -56,13 +56,25 @@ public function definition() {
 
 require_login();
 
+/**
+ * Panopto reinitialize.
+ *
+ */
+abstract class panopto_reinitialize {
+    const NO_COURSE_EXISTS = 'NO_COURSE_EXISTS';
+    const INVALID_PANOPTO_DATA = 'INVALID_PANOPTO_DATA';
+}
+
+/**
+ * Reinitialize all imports.
+ *
+ * @package block_panopto
+ * @copyright  Panopto 2020
+ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
 function reinitialize_all_imports() {
     global $DB;
 
-    $NO_COURSE_EXISTS = "NO_COURSE_EXISTS";
-    $INVALID_PANOPTO_DATA = "INVALID_PANOPTO_DATA";
-
-
     $courseimports = $DB->get_records('block_panopto_importmap');
 
     $coursepanoptoarray = array();
@@ -85,7 +97,9 @@ function reinitialize_all_imports() {
             if ($targetcourseexists && $hasvalidpanoptodata) {
                 $coursepanoptoarray[$courseimport->target_moodle_id] = $targetpanopto;
             } else {
-                $coursepanoptoarray[$courseimport->target_moodle_id] = !$targetcourseexists ? $NO_COURSE_EXISTS : $INVALID_PANOPTO_DATA;
+                $coursepanoptoarray[$courseimport->target_moodle_id] = !$targetcourseexists
+                    ? panopto_reinitialize::NO_COURSE_EXISTS
+                    : panopto_reinitialize::INVALID_PANOPTO_DATA;
                 \panopto_data::delete_panopto_relation($courseimport->target_moodle_id, true);
             }
         }
@@ -94,17 +108,17 @@ function reinitialize_all_imports() {
         $targetpanoptodata = null;
         $importresult = null;
 
-        if ($targetpanopto !== $NO_COURSE_EXISTS &&
-            $targetpanopto !== $INVALID_PANOPTO_DATA) {
+        if ($targetpanopto !== panopto_reinitialize::NO_COURSE_EXISTS &&
+            $targetpanopto !== panopto_reinitialize::INVALID_PANOPTO_DATA) {
 
             $targetpanopto->ensure_auth_manager();
             $activepanoptoserverversion = $targetpanopto->authmanager->get_server_version();
             $useccv2 = version_compare(
-                $activepanoptoserverversion, 
-                \panopto_data::$ccv2requiredpanoptoversion, 
+                $activepanoptoserverversion,
+                \panopto_data::$ccv2requiredpanoptoversion,
                 '>='
             );
-            
+
             $targetpanoptodata = $targetpanopto->get_provisioning_info();
 
             $importresults = null;
diff --git a/settings.php b/settings.php
index 99039d5..e836872 100644
--- a/settings.php
+++ b/settings.php
@@ -150,7 +150,7 @@
             'block_panopto/sso_sync_type',
             get_string('block_panopto_sso_sync_type', 'block_panopto'),
             get_string('block_panopto_sso_sync_type_desc', 'block_panopto'),
-            'nosync', // Default to authentication without sync
+            'nosync', // Default to authentication without sync.
             $possiblessosynctypes
         )
     );
@@ -174,7 +174,7 @@
             'block_panopto/folder_name_style',
             get_string('block_panopto_folder_name_style', 'block_panopto'),
             get_string('block_panopto_folder_name_style_desc', 'block_panopto'),
-            'fullname', // Default to longname only
+            'fullname', // Default to longname only.
             $possiblefoldernamestyles
         )
     );
@@ -207,7 +207,7 @@
             0
         )
     );
-    
+
     $settings->add(
         new admin_setting_configcheckbox(
             'block_panopto/auto_sync_imports',
@@ -297,7 +297,7 @@
     $settings->add(new admin_setting_heading('block_panopto/panopto_http_and_debug_settings',
             get_string('block_global_panopto_http_and_debug_settings', 'block_panopto'),
             ''));
-    
+
     $settings->add(
         new admin_setting_configcheckbox(
             'block_panopto/print_log_to_file',
@@ -368,7 +368,7 @@
             get_string('block_global_panopto_bulk_and_batch_tools', 'block_panopto'),
             ''));
 
-    $categorystructurelink = '<a id="panopto_build_category_structure_btn" href="' . $CFG->wwwroot . 
+    $categorystructurelink = '<a id="panopto_build_category_structure_btn" href="' . $CFG->wwwroot .
         '/blocks/panopto/build_category_structure.php">' .
         get_string('block_global_build_category_structure', 'block_panopto') . '</a>';
 
@@ -379,8 +379,8 @@
 
     $settings->add(new admin_setting_heading('block_panopto_add_courses', '', $link));
 
-    $unprovisionlink = '<a id="panopto_unprovision_course_btn" href="' . $CFG->wwwroot . '/blocks/panopto/unprovision_course.php">' .
-        get_string('block_global_unprovision_courses', 'block_panopto') . '</a>';
+    $unprovisionlink = '<a id="panopto_unprovision_course_btn" href="' . $CFG->wwwroot .
+        '/blocks/panopto/unprovision_course.php">' . get_string('block_global_unprovision_courses', 'block_panopto') . '</a>';
     $settings->add(new admin_setting_heading('block_panopto_unprovision_courses', '', $unprovisionlink));
 
     $importlink = '<a id="panopto_reinitialize_imports_btn" href="' . $CFG->wwwroot . '/blocks/panopto/reinitialize_imports.php">' .
diff --git a/styles.css b/styles.css
index e9925cb..81cd9f7 100644
--- a/styles.css
+++ b/styles.css
@@ -1,99 +1,82 @@
-.block_panopto .panoptoProcessInformation
-{
+.block_panopto .panoptoProcessInformation {
     border: solid 1px #C0C0C0;
     padding: 5px;
     margin-bottom: 20px;
 }
 
-.block_panopto .panoptoProcessInformation .attribute
-{
+.block_panopto .panoptoProcessInformation .attribute {
     font-weight: bold;
 }
 
-.block_panopto .panoptoProcessInformation .value
-{
+.block_panopto .panoptoProcessInformation .value {
     margin-left: 15px;
     margin-bottom: 5px;
 }
 
-.block_panopto .panoptoProcessInformation .successMessage
-{
+.block_panopto .panoptoProcessInformation .successMessage {
     color: green;
 }
 
-.block_panopto .panoptoProcessInformation .errorMessage
-{
+.block_panopto .panoptoProcessInformation .errorMessage {
     color: red;
 }
 
 
 /* Block sidebar */
 
-.block_panopto .sectionHeader
-{
+.block_panopto .sectionHeader {
     margin-top: 10px;
 }
 
-.block_panopto #hiddenLecturesDiv
-{
+.block_panopto #hiddenLecturesDiv {
     display: none;
 }
 
-.block_panopto #showAllDiv
-{
+.block_panopto #showAllDiv {
     margin-top: 5px;
 }
 
-.block_panopto #showAllToggle
-{
+.block_panopto #showAllToggle {
     font-weight: bold;
     font-size: 0.8em;
 }
 
-.block_panopto .listItem
-{
+.block_panopto .listItem {
     margin-top: 3px;
     font-size: 0.8em;
 }
 
-.block_panopto .listItemAlt
-{
+.block_panopto .listItemAlt {
     background: #F0F0F0;
 }
 
-.block_panopto .rssLink
-{
+.block_panopto .rssLink {
     font-size: 0.8em;
 }
 
-.block_panopto .rssParen
-{
+.block_panopto .rssParen {
     font-size: 0.7em;
 }
 
-.block_panopto .nowrap
-{
+.block_panopto .nowrap {
     white-space: nowrap;
 }
 
-.block_panopto .error
-{
+.block_panopto .error {
     color: red;
 }
 
-/* Block progress bar */ 
-.block_panopto .panopto-progress-bar-container
-{
+/* Block progress bar */
+.block_panopto .panopto-progress-bar-container {
     position: relative;
     margin: 20px auto;
     width: 420px;
     height: 60px;
 }
 
-.block_panopto .panopto-progress-bar-container .panopto-progress-bar
-{
+.block_panopto .panopto-progress-bar-container .panopto-progress-bar {
     position: relative;
-    border:1px solid #ccc;
+    border: 1px solid #ccc;
     left: 0px;
     margin-bottom: 5px;
     width: 100%;
diff --git a/unprovision_course.php b/unprovision_course.php
index 3392127..2c5a099 100644
--- a/unprovision_course.php
+++ b/unprovision_course.php
@@ -101,7 +101,7 @@
             $panoptodata = new \panopto_data($courseid);
             $unprovisioninginfo = $panoptodata->get_provisioning_info();
             $unprovisionwassuccess = $panoptodata->unprovision_course();
-            
+
             include('views/unprovisioned_course.html.php');
         }
         echo "<a href='$returnurl'>" . get_string('back_to_config', 'block_panopto') . '</a>';
@@ -111,5 +111,4 @@
 
     echo $OUTPUT->footer();
 }
-
 /* End of file unprovision_course.php */
diff --git a/unprovision_course_internal.php b/unprovision_course_internal.php
index 53285c1..1718989 100644
--- a/unprovision_course_internal.php
+++ b/unprovision_course_internal.php
@@ -89,4 +89,4 @@
 
 echo $OUTPUT->footer();
 
-/* End of file unprovision_course.php */
\ No newline at end of file
+/* End of file unprovision_course.php */
diff --git a/upgrade_all_folders.php b/upgrade_all_folders.php
index 04d44a6..ebff01c 100644
--- a/upgrade_all_folders.php
+++ b/upgrade_all_folders.php
@@ -15,7 +15,7 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * the Generation 1 to Generation 2 logic for Panopto
+ * The Generation 1 to Generation 2 logic for Panopto
  *
  * @package block_panopto
  * @copyright  Panopto 2009 - 2017
@@ -66,7 +66,7 @@
 if ($mform->is_cancelled()) {
     redirect(new moodle_url($returnurl));
 } else if ($mform->get_data()) {
-    // calling this with null parameter should upgrade everything. 
+    // Calling this with null parameter should upgrade everything.
     panopto_upgrade_all_folders(null);
 
     echo "<a href='$returnurl'>" . get_string('back_to_config', 'block_panopto') . '</a>';
diff --git a/version.php b/version.php
index 8f5009d..66963ef 100644
--- a/version.php
+++ b/version.php
@@ -15,7 +15,7 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * contains the version information for Panopto
+ * Contains the version information for Panopto
  *
  * @package block_panopto
  * @copyright  Panopto 2009 - 2016 with contributions from Spenser Jones (sjones@ambrose.edu)
@@ -29,7 +29,7 @@
 
 // Plugin version should normally be the same as the internal version.
 // If an admin wants to install with an older version number, however, set that here.
-$plugin->version = 2022070700;
+$plugin->version = 2022090700;
 
 // Requires this Moodle version - 2.7.
 $plugin->requires  = 2014051200;
diff --git a/views/bulk_rename_single_failed.html.php b/views/bulk_rename_single_failed.html.php
index c5630d2..60c9c5e 100644
--- a/views/bulk_rename_single_failed.html.php
+++ b/views/bulk_rename_single_failed.html.php
@@ -15,12 +15,13 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * the template used to display when we begin processing 
+ * The template used to display when we begin processing
  *
  * @package block_panopto
  * @copyright  Panopto 2009 - 2017
  * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
+defined('MOODLE_INTERNAL') || die();
 ?>
 
 <div class='block_panopto'>
diff --git a/views/bulk_rename_single_success.html.php b/views/bulk_rename_single_success.html.php
index 14f96cf..1e8318b 100644
--- a/views/bulk_rename_single_success.html.php
+++ b/views/bulk_rename_single_success.html.php
@@ -15,12 +15,13 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * the template used to display when we begin processing 
+ * The template used to display when we begin processing
  *
  * @package block_panopto
  * @copyright  Panopto 2009 - 2017
  * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
+defined('MOODLE_INTERNAL') || die();
 ?>
 
 <div class='block_panopto'>
diff --git a/views/bulk_task_access_error.html.php b/views/bulk_task_access_error.html.php
index d9e8167..95dcce7 100644
--- a/views/bulk_task_access_error.html.php
+++ b/views/bulk_task_access_error.html.php
@@ -15,12 +15,13 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * the template used to display when we begin processing 
+ * The template used to display when we begin processing
  *
  * @package block_panopto
  * @copyright  Panopto 2009 - 2017
  * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
+defined('MOODLE_INTERNAL') || die();
 ?>
 
 <div class='block_panopto'>
diff --git a/views/bulk_task_progress_bar.html.php b/views/bulk_task_progress_bar.html.php
index b5c86ef..644ce38 100644
--- a/views/bulk_task_progress_bar.html.php
+++ b/views/bulk_task_progress_bar.html.php
@@ -15,12 +15,13 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * the template used to display when we begin processing 
+ * The template used to display when we begin processing
  *
  * @package block_panopto
  * @copyright  Panopto 2009 - 2017
  * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
+defined('MOODLE_INTERNAL') || die();
 ?>
 
 <div class='block_panopto'>
diff --git a/views/bulk_task_rename_warning.html.php b/views/bulk_task_rename_warning.html.php
index b29b745..94c7a5b 100644
--- a/views/bulk_task_rename_warning.html.php
+++ b/views/bulk_task_rename_warning.html.php
@@ -15,12 +15,13 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * the template used to display when we begin processing 
+ * The template used to display when we begin processing
  *
  * @package block_panopto
  * @copyright  Panopto 2009 - 2017
  * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
+defined('MOODLE_INTERNAL') || die();
 ?>
 
 <div class='block_panopto'>
@@ -37,4 +38,4 @@
             <?php echo get_string('bulk_task_contact_support', 'block_panopto') ?>
         </div>
     </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/views/bulk_task_reprovision_warning.html.php b/views/bulk_task_reprovision_warning.html.php
index 6d49d57..59c9845 100644
--- a/views/bulk_task_reprovision_warning.html.php
+++ b/views/bulk_task_reprovision_warning.html.php
@@ -15,12 +15,13 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * the template used to display when we begin processing 
+ * The template used to display when we begin processing
  *
  * @package block_panopto
  * @copyright  Panopto 2009 - 2017
  * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
+defined('MOODLE_INTERNAL') || die();
 ?>
 
 <div class='block_panopto'>
@@ -37,4 +38,4 @@
             <?php echo get_string('bulk_task_contact_support', 'block_panopto') ?>
         </div>
     </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/views/bulk_task_version_error.html.php b/views/bulk_task_version_error.html.php
index e4b3882..c4903ad 100644
--- a/views/bulk_task_version_error.html.php
+++ b/views/bulk_task_version_error.html.php
@@ -15,12 +15,13 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * the template used to display when we begin processing 
+ * The template used to display when we begin processing
  *
  * @package block_panopto
  * @copyright  Panopto 2009 - 2017
  * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
+defined('MOODLE_INTERNAL') || die();
 ?>
 
 <div class='block_panopto'>
diff --git a/views/ensure_category_branch_failed.html.php b/views/ensure_category_branch_failed.html.php
index 33ead0f..c73adf8 100644
--- a/views/ensure_category_branch_failed.html.php
+++ b/views/ensure_category_branch_failed.html.php
@@ -15,18 +15,25 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * the template used to display when we begin processing 
+ * The template used to display when we begin processing
  *
  * @package block_panopto
  * @copyright  Panopto 2009 - 2017
  * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
+defined('MOODLE_INTERNAL') || die();
 ?>
             <?php if (isset($panoptoversioninfo) && !empty($panoptoversioninfo)) { ?>
-            <div class='errorMessage'><?php echo get_string('categories_need_newer_panopto', 'block_panopto', $panoptoversioninfo) ?></div>
+            <div class='errorMessage'>
+                <?php echo get_string('categories_need_newer_panopto', 'block_panopto', $panoptoversioninfo) ?>
+            </div>
             <?php } else { ?>
-            <div class='attribute'><?php echo get_string('attribute_ensure_branch_failed', 'block_panopto') ?></div>
-            <div class='value'><?php echo get_string('ensure_category_branch_failed', 'block_panopto') ?></div>
+            <div class='attribute'>
+                <?php echo get_string('attribute_ensure_branch_failed', 'block_panopto') ?>
+            </div>
+            <div class='value'>
+                <?php echo get_string('ensure_category_branch_failed', 'block_panopto') ?>
+            </div>
             <?php } ?>
         </div>
     </div>
diff --git a/views/ensure_category_branch_start.html.php b/views/ensure_category_branch_start.html.php
index c87423d..4b4254a 100644
--- a/views/ensure_category_branch_start.html.php
+++ b/views/ensure_category_branch_start.html.php
@@ -15,12 +15,13 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * the template used to display when we begin processing 
+ * The template used to display when we begin processing
  *
  * @package block_panopto
  * @copyright  Panopto 2009 - 2017
  * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
+defined('MOODLE_INTERNAL') || die();
 ?>
 
 <div class='block_panopto'>
@@ -33,10 +34,10 @@
                 <div class='value'><?php echo $branchinfo['targetserver'] ?></div>
                 <div class='attribute'><?php echo get_string('attribute_target_branch_leaf', 'block_panopto') ?></div>
                 <div class='value'><?php echo $branchinfo['categoryname'] ?></div>
-            <?php
+                <?php
             } else {
             ?>
                 <div class='errorMessage'><?php echo get_string('error_invalid_category_information', 'block_panopto') ?></div>
-            <?php
+                <?php
             }
             ?>
diff --git a/views/ensure_category_branch_success.html.php b/views/ensure_category_branch_success.html.php
index 6b83110..f8e0016 100644
--- a/views/ensure_category_branch_success.html.php
+++ b/views/ensure_category_branch_success.html.php
@@ -15,12 +15,13 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * the template used to display when we begin processing 
+ * The template used to display when we begin processing
  *
  * @package block_panopto
  * @copyright  Panopto 2009 - 2017
  * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
+defined('MOODLE_INTERNAL') || die();
 ?>
             <div class='attribute'><?php echo get_string('attribute_ensured_branch', 'block_panopto') ?></div>
             <div class='value'><?php echo $ensuredbranch ?></div>
diff --git a/views/imported_course.html.php b/views/imported_course.html.php
index 49fbaf8..eb52b84 100644
--- a/views/imported_course.html.php
+++ b/views/imported_course.html.php
@@ -15,12 +15,13 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * the imported course result template
+ * The imported course result template
  *
  * @package block_panopto
  * @copyright  Panopto 2009 - 2017
  * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
+defined('MOODLE_INTERNAL') || die();
 ?>
 
 <div class='block_panopto'>
@@ -37,23 +38,23 @@
                 <div class='value'><?php echo $targetpanopto->servername ?></div>
                 <div class='attribute'><?php echo get_string('import_status', 'block_panopto') ?></div>
                 <?php
-                foreach($importresults as $importresult) {
-                    if(isset($importresult->errormessage)) {
+                foreach ($importresults as $importresult) {
+                    if (isset($importresult->errormessage)) {
                     ?>
                         <div class='value'>
                             <?php echo get_string('import_error', 'block_panopto', $importresult) ?>
                         </div>
-                    <?php
+                        <?php
                     } else {
                     ?>
                         <div class='value'>
                             <?php echo get_string('import_success', 'block_panopto', $importresult) ?>
                         </div>
-                    <?php
+                        <?php
                     }
                 }
             } else {
-                if ($targetpanopto === $NO_COURSE_EXISTS) {
+                if ($targetpanopto === panopto_reinitialize::NO_COURSE_EXISTS) {
                     ?>
                         <div class='errorMessage'><?php echo get_string('target_moodle_course_deleted', 'block_panopto') ?></div>
                     <?php
diff --git a/views/provisioned_course.html.php b/views/provisioned_course.html.php
index af2641d..72b0a77 100644
--- a/views/provisioned_course.html.php
+++ b/views/provisioned_course.html.php
@@ -15,12 +15,13 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * the provisioned course template
+ * The provisioned course template
  *
  * @package block_panopto
  * @copyright  Panopto 2009 - 2015
  * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
+defined('MOODLE_INTERNAL') || die();
 ?>
 
 <div class='block_panopto'>
@@ -38,9 +39,8 @@
                     <div class='value'><?php echo $provisioneddata->moodlecourseid ?></div>
                     <div class='attribute'><?php echo get_string('attempted_panopto_server', 'block_panopto') ?></div>
                     <div class='value'><?php echo $provisioneddata->servername ?></div>
-                <?php
-                } 
-                else if (isset($provisioneddata->accesserror) && $provisioneddata->accesserror === true) {
+                    <?php
+                } else if (isset($provisioneddata->accesserror) && $provisioneddata->accesserror === true) {
                 ?>
                     <div class='errorMessage'>
                         <?php echo get_string('provision_access_error', 'block_panopto') ?>
@@ -50,9 +50,8 @@
                     <div class='value'><?php echo $provisioneddata->moodlecourseid ?></div>
                     <div class='attribute'><?php echo get_string('attempted_panopto_server', 'block_panopto') ?></div>
                     <div class='value'><?php echo $provisioneddata->servername ?></div>
-                <?php
-                } 
-                else if (isset($provisioneddata->unknownerror) && $provisioneddata->unknownerror === true) {
+                    <?php
+                } else if (isset($provisioneddata->unknownerror) && $provisioneddata->unknownerror === true) {
                 ?>
                     <div class='errorMessage'>
                         <?php echo get_string('provision_error', 'block_panopto') ?>
@@ -62,9 +61,8 @@
                     <div class='value'><?php echo $provisioneddata->moodlecourseid ?></div>
                     <div class='attribute'><?php echo get_string('attempted_panopto_server', 'block_panopto') ?></div>
                     <div class='value'><?php echo $provisioneddata->servername ?></div>
-                <?php
-                }
-                else {
+                    <?php
+                } else {
                 ?>
                     <div class='attribute'><?php echo get_string('course_name', 'block_panopto') ?></div>
                     <div class='value'><?php echo $provisioningdata->fullname ?></div>
@@ -73,7 +71,7 @@
                     <?php if (get_config('block_panopto', 'sync_after_login') || get_config('block_panopto', 'sync_on_enrolment')) { ?>
                         <div class='value'><?php echo get_string('users_will_be_synced_custom', 'block_panopto') ?></div>
                     <?php } ?>
-                    <?php if(get_config('block_panopto', 'async_tasks')) { ?>
+                    <?php if (get_config('block_panopto', 'async_tasks')) { ?>
                             <div class='value'><?php echo get_string('async_wait_warning', 'block_panopto'); ?></div>
                     <?php } ?>
                     <?php if (!get_config('block_panopto', 'sync_after_provisioning')) { ?>
@@ -83,31 +81,31 @@
                         <div class='attribute'><?php echo get_string('publishers', 'block_panopto') ?></div>
                         <div class='value'>
                         <?php
-                            if (!empty($provisioneddata->publishers)) {
-                                echo join(', ', $provisioneddata->publishers);
-                            } else {
-                                ?><div class='errorMessage'><?php echo get_string('no_publishers', 'block_panopto') ?></div><?php
-                            }
+                        if (!empty($provisioneddata->publishers)) {
+                            echo join(', ', $provisioneddata->publishers);
+                        } else {
+                            ?><div class='errorMessage'><?php echo get_string('no_publishers', 'block_panopto') ?></div><?php
+                        }
                         ?>
                         </div>
                         <div class='attribute'><?php echo get_string('creators', 'block_panopto') ?></div>
                         <div class='value'>
                         <?php
-                            if (!empty($provisioneddata->creators)) {
-                                echo join(', ', $provisioneddata->creators);
-                            } else {
-                                ?><div class='errorMessage'><?php echo get_string('no_creators', 'block_panopto') ?></div><?php
-                            }
+                        if (!empty($provisioneddata->creators)) {
+                            echo join(', ', $provisioneddata->creators);
+                        } else {
+                            ?><div class='errorMessage'><?php echo get_string('no_creators', 'block_panopto') ?></div><?php
+                        }
                         ?>
                         </div>
                         <div class='attribute'><?php echo get_string('viewers', 'block_panopto') ?></div>
                         <div class='value'>
                         <?php
-                            if (!empty($provisioneddata->viewers)) {
-                                echo join(', ', $provisioneddata->viewers);
-                            } else {
-                                ?><div class='errorMessage'><?php echo get_string('no_viewers', 'block_panopto') ?></div><?php
-                            }
+                        if (!empty($provisioneddata->viewers)) {
+                            echo join(', ', $provisioneddata->viewers);
+                        } else {
+                            ?><div class='errorMessage'><?php echo get_string('no_viewers', 'block_panopto') ?></div><?php
+                        }
                         ?>
                         </div>
                     <?php } ?>
@@ -117,7 +115,7 @@
                             <?php echo get_string('provision_successful', 'block_panopto', $provisioneddata->Id) ?>
                         </div>
                     </div>
-                <?php
+                    <?php
                 }
             } else {
                 ?>
diff --git a/views/unprovisioned_course.html.php b/views/unprovisioned_course.html.php
index 8bfe75e..8908776 100644
--- a/views/unprovisioned_course.html.php
+++ b/views/unprovisioned_course.html.php
@@ -15,19 +15,20 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * the provisioned course template
+ * The provisioned course template
  *
  * @package block_panopto
  * @copyright  Panopto 2009 - 2015
  * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
+defined('MOODLE_INTERNAL') || die();
 ?>
 
 <div class='block_panopto'>
     <div class='panoptoProcessInformation'>
         <div class='value'>
             <?php
-            if ($unprovisionwassuccess && !empty($panoptodata) && !empty($unprovisioninginfo)) { 
+            if ($unprovisionwassuccess && !empty($panoptodata) && !empty($unprovisioninginfo)) {
             ?>
                 <div class='attribute'><?php echo get_string('course_name', 'block_panopto') ?></div>
                 <div class='value'><?php echo $unprovisioninginfo->fullname ?></div>
@@ -37,13 +38,13 @@
                         <?php echo get_string('unprovision_successful', 'block_panopto', $panoptodata->moodlecourseid) ?>
                     </div>
                 </div>
-            <?php 
+                <?php
             } else {
             ?>
                 <div class='errorMessage'><?php echo get_string('unprovision_error', 'block_panopto') ?></div>
-            <?php
+                <?php
             }
             ?>
         </div>
     </div>
-</div>
\ No newline at end of file
+</div>