Fixing coding issues.

Also, removing "Add to calendar" since it gives error for non-hosts.
lukasnoebauer · Sep 21, 2018 · e2be38b · e2be38b
1 parent 425ae53
commit e2be38b
Show file tree

Hide file tree

Showing 10 changed files with 29 additions and 29 deletions.
diff --git a/classes/privacy/provider.php b/classes/privacy/provider.php
@@ -49,7 +49,7 @@ class provider implements
      */
     public static function get_metadata(\core_privacy\local\metadata\collection $collection):
         \core_privacy\local\metadata\collection {
-            // Add all user data fields to the collection.
+        // Add all user data fields to the collection.
 
         $collection->add_database_table('mdl_zoom_meeting_participants', [
             'name' => 'privacy:metadata:mdl_zoom_meeting_participants:name',

diff --git a/classes/task/get_meeting_reports.php b/classes/task/get_meeting_reports.php
@@ -69,7 +69,9 @@ private function format_participant($participant, $detailsid, $names, $emails) {
             $name = $names[$moodleuserid];
         } else if (!empty($participant->name) && ($moodleuserid = array_search($participant->name, $names))) {
             $name = $names[$moodleuserid];
-        } else if (!empty($participant->user_email) && ($moodleuser = $DB->get_record('user', array('email' => $participant->user_email, 'deleted' => 0, 'suspended' => 0), '*', IGNORE_MULTIPLE))) {
+        } else if (!empty($participant->user_email) &&
+                ($moodleuser = $DB->get_record('user', array('email' => $participant->user_email,
+                'deleted' => 0, 'suspended' => 0), '*', IGNORE_MULTIPLE))) {
             // This is the case where someone attends the meeting, but is not enrolled in the class.
             $moodleuserid = $moodleuser->id;
             $name = strtoupper(fullname($moodleuser));

diff --git a/db/services.php b/db/services.php
@@ -33,7 +33,8 @@
         'classname'     => 'mod_zoom_external',
         'methodname'    => 'get_state',
         'classpath'     => 'mod/zoom/classes/external.php',
-        'description'   => 'Determine if a zoom meeting is available, meeting status, and the start time, duration, and other meeting options.',
+        'description'   => 'Determine if a zoom meeting is available, meeting '
+        . 'status, and the start time, duration, and other meeting options.',
         'type'          => 'read',
         'capabilities'  => 'mod/zoom:view',
         'services'      => array(MOODLE_OFFICIAL_MOBILE_SERVICE, 'local_mobile'),

diff --git a/jwt/BeforeValidException.php b/jwt/BeforeValidException.php
@@ -1,3 +1,4 @@
 <?php
+//@codingStandardsIgnoreStart - Ignore library file.
 namespace Firebase\JWT;
 class BeforeValidException extends \UnexpectedValueException {}
diff --git a/jwt/ExpiredException.php b/jwt/ExpiredException.php
@@ -1,3 +1,4 @@
 <?php
+//@codingStandardsIgnoreStart - Ignore library file.
 namespace Firebase\JWT;
 class ExpiredException extends \UnexpectedValueException {}
diff --git a/jwt/JWT.php b/jwt/JWT.php
@@ -1,5 +1,5 @@
 <?php
-
+//@codingStandardsIgnoreStart - Ignore library file.
 namespace Firebase\JWT;
 use \DomainException;
 use \InvalidArgumentException;

diff --git a/jwt/SignatureInvalidException.php b/jwt/SignatureInvalidException.php
@@ -1,3 +1,4 @@
-<?php
-namespace Firebase\JWT;
-class SignatureInvalidException extends \UnexpectedValueException {}
+<?php
+//@codingStandardsIgnoreStart - Ignore library file.
+namespace Firebase\JWT;
+class SignatureInvalidException extends \UnexpectedValueException {}
diff --git a/loadmeeting.php b/loadmeeting.php
@@ -25,8 +25,6 @@
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
-global $CFG, $DB;
-
 require_once(dirname(dirname(dirname(__FILE__))).'/config.php');
 require_once($CFG->libdir . '/gradelib.php');
 require_once($CFG->libdir . '/moodlelib.php');

diff --git a/participants.php b/participants.php
@@ -107,7 +107,7 @@
     $name = $p->name;
     if (!empty($moodleuser->email)) {
         $row[] = html_writer::link("mailto:$moodleuser->email", $name);
-    } else if (!empty($p->user_email)){
+    } else if (!empty($p->user_email)) {
         $row[] = html_writer::link("mailto:$p->user_email", $name);
     } else {
         $row[] = $name;

diff --git a/view.php b/view.php
@@ -52,13 +52,6 @@
 $PAGE->set_title(format_string($zoom->name));
 $PAGE->set_heading(format_string($course->fullname));
 
-/*
- * Other things you may want to set - remove if not needed.
- * $PAGE->set_cacheable(false);
- * $PAGE->set_focuscontrol('some-html-id');
- * $PAGE->add_body_class('zoom-'.$somevar);
- */
-
 $zoomuserid = zoom_get_user_id(false);
 $userishost = ($zoomuserid == $zoom->host_id);
 
@@ -147,18 +140,21 @@
     }
 }
 
-// Generate add-to-calendar buttons if meeting was found.
-if (!$showrecreate) {
-    $googlelink = 'https://ucla.zoom.us/meeting/' . $zoom->meeting_id . '/calendar/google/add';
-    $outlooklink = 'https://ucla.zoom.us/meeting/' . $zoom->meeting_id . '/ics';
-    $googleicon = $OUTPUT->pix_icon('i/google', get_string('googleiconalt', 'mod_zoom'), 'mod_zoom');
-    $windowsicon = $OUTPUT->pix_icon('i/windows', get_string('windowsiconalt', 'mod_zoom'), 'mod_zoom');
-    $googlebutton = html_writer::div($googleicon . ' ' . get_string('googlecalendar', 'mod_zoom'), 'btn btn-primary');
-    $outlookbutton = html_writer::div($windowsicon . ' ' . get_string('outlook', 'mod_zoom'), 'btn btn-primary');
-    $googlehtml = html_writer::link($googlelink, $googlebutton, array('target' => '_blank'));
-    $outlookhtml = html_writer::link($outlooklink, $outlookbutton, array('target' => '_blank'));
-    $table->data[] = array(get_string('addtocalendar', 'mod_zoom'), $googlehtml . $outlookhtml);
-}
+//@codingStandardsIgnoreStart
+// TODO: Commenting out because it requires user to be host. Need to generate ical file ourselves.
+//// Generate add-to-calendar buttons if meeting was found.
+//if (!$showrecreate) {
+//    $googlelink = 'https://ucla.zoom.us/meeting/' . $zoom->meeting_id . '/calendar/google/add';
+//    $outlooklink = 'https://ucla.zoom.us/meeting/' . $zoom->meeting_id . '/ics';
+//    $googleicon = $OUTPUT->pix_icon('i/google', get_string('googleiconalt', 'mod_zoom'), 'mod_zoom');
+//    $windowsicon = $OUTPUT->pix_icon('i/windows', get_string('windowsiconalt', 'mod_zoom'), 'mod_zoom');
+//    $googlebutton = html_writer::div($googleicon . ' ' . get_string('googlecalendar', 'mod_zoom'), 'btn btn-primary');
+//    $outlookbutton = html_writer::div($windowsicon . ' ' . get_string('outlook', 'mod_zoom'), 'btn btn-primary');
+//    $googlehtml = html_writer::link($googlelink, $googlebutton, array('target' => '_blank'));
+//    $outlookhtml = html_writer::link($outlooklink, $outlookbutton, array('target' => '_blank'));
+//    $table->data[] = array(get_string('addtocalendar', 'mod_zoom'), $googlehtml . $outlookhtml);
+//}
+//@codingStandardsIgnoreEnd
 
 if ($zoom->recurring) {
     $recurringmessage = new html_table_cell(get_string('recurringmeetinglong', 'mod_zoom'));