diff --git a/action.php b/action.php
index f8c53c3..56aeab2 100644
--- a/action.php
+++ b/action.php
@@ -27,7 +27,7 @@
*
* @package mod_pdfannotator
* @copyright 2018 RWTH Aachen (see README.md)
- * @author Rabea de Groot, Anna Heynkes, Friederike Schwager
+ * @author Rabea de Groot, Anna Heynkes, Friederike Schwager
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
@@ -388,8 +388,6 @@
$comments = pdfannotator_comment::read($documentid, $annotationid, $context);
- // require_once($CFG->dirroot . '/mod/pdfannotator/classes/output/comment.php');
-
$myrenderer = $PAGE->get_renderer('mod_pdfannotator');
$templatable = new comment($comments, $cm, $context);
@@ -455,7 +453,7 @@
$commentid = required_param('commentId', PARAM_INT);
$content = required_param('content', PARAM_RAW);
-
+
$data = pdfannotator_comment::update($commentid, $content, $editanypost);
echo json_encode($data);
}
diff --git a/backup/moodle2/backup_pdfannotator_activity_task.class.php b/backup/moodle2/backup_pdfannotator_activity_task.class.php
index 09d938e..849257d 100644
--- a/backup/moodle2/backup_pdfannotator_activity_task.class.php
+++ b/backup/moodle2/backup_pdfannotator_activity_task.class.php
@@ -75,7 +75,7 @@ protected function define_my_steps() {
* @param string $content some HTML text that eventually contains URLs to the activity instance scripts
* @return string the content with the URLs encoded
*/
- static public function encode_content_links($content) {
+ public static function encode_content_links($content) {
global $CFG, $DB;
diff --git a/backup/moodle2/backup_pdfannotator_stepslib.php b/backup/moodle2/backup_pdfannotator_stepslib.php
index 73f5b90..5160537 100644
--- a/backup/moodle2/backup_pdfannotator_stepslib.php
+++ b/backup/moodle2/backup_pdfannotator_stepslib.php
@@ -54,23 +54,27 @@ protected function define_structure() {
// 2. Define each element separately.
$pdfannotator = new backup_nested_element('pdfannotator', array('id'), array(
- 'name', 'intro', 'introformat', 'usevotes', 'useprint', 'useprintcomments', 'use_studenttextbox', 'use_studentdrawing', 'useprivatecomments', 'useprotectedcomments', 'timecreated', 'timemodified'));
+ 'name', 'intro', 'introformat', 'usevotes', 'useprint', 'useprintcomments', 'use_studenttextbox', 'use_studentdrawing',
+ 'useprivatecomments', 'useprotectedcomments', 'timecreated', 'timemodified'));
$annotations = new backup_nested_element('annotations');
- $annotation = new backup_nested_element('annotation', array('id'), array('page', 'userid', 'annotationtypeid', 'data', 'timecreated', 'timemodified', 'modifiedby'));
+ $annotation = new backup_nested_element('annotation', array('id'), array('page', 'userid', 'annotationtypeid',
+ 'data', 'timecreated', 'timemodified', 'modifiedby'));
$subscriptions = new backup_nested_element('subscriptions');
$subscription = new backup_nested_element('subscription', array('id'), array('userid'));
$comments = new backup_nested_element('comments');
- $c = array('pdfannotatorid', 'userid', 'content', 'timecreated', 'timemodified', 'modifiedby', 'visibility', 'isquestion', 'isdeleted', 'ishidden', 'solved');
+ $c = array('pdfannotatorid', 'userid', 'content', 'timecreated', 'timemodified', 'modifiedby', 'visibility',
+ 'isquestion', 'isdeleted', 'ishidden', 'solved');
$comment = new backup_nested_element('comment', array('id'), $c);
$votes = new backup_nested_element('votes');
$vote = new backup_nested_element('vote', array('id'), array('userid', 'annotationid'));
$reports = new backup_nested_element('reports');
- $report = new backup_nested_element('report', array('id'), array('courseid', 'pdfannotatorid', 'message', 'userid', 'timecreated', 'seen'));
+ $report = new backup_nested_element('report', array('id'), array('courseid', 'pdfannotatorid', 'message',
+ 'userid', 'timecreated', 'seen'));
// 3. Build the tree (mind the right order!)
$pdfannotator->add_child($annotations);
@@ -97,7 +101,8 @@ protected function define_structure() {
// Add all annotations specific to this annotator instance.
$annotation->set_source_sql('SELECT a.* FROM {pdfannotator_annotations} a '
. 'JOIN {pdfannotator_comments} c ON a.id = c.annotationid '
- . "WHERE a.pdfannotatorid = ? AND c.isquestion = 1 AND (c.visibility = 'public' OR c.visibility = 'anonymous') ",
+ . "WHERE a.pdfannotatorid = ? AND c.isquestion = 1 AND "
+ . "(c.visibility = 'public' OR c.visibility = 'anonymous') ",
array('pdfannotatorid' => backup::VAR_PARENTID));
// Add any subscriptions to this annotation.
diff --git a/backup/moodle2/restore_pdfannotator_activity_task.class.php b/backup/moodle2/restore_pdfannotator_activity_task.class.php
index 9872858..25ca6b9 100644
--- a/backup/moodle2/restore_pdfannotator_activity_task.class.php
+++ b/backup/moodle2/restore_pdfannotator_activity_task.class.php
@@ -57,7 +57,7 @@ protected function define_my_steps() {
* Define the contents in the activity that must be
* processed by the link decoder.
*/
- static public function define_decode_contents() {
+ public static function define_decode_contents() {
$contents = array();
$contents[] = new restore_decode_content('pdfannotator', array('intro'), 'pdfannotator');
@@ -69,7 +69,7 @@ static public function define_decode_contents() {
* Define the decoding rules for links belonging
* to the activity to be executed by the link decoder
*/
- static public function define_decode_rules() {
+ public static function define_decode_rules() {
$rules = array();
$rules[] = new restore_decode_rule('PDFANNOTATORVIEWBYID', '/mod/pdfannotator/view.php?id=$1', 'course_module');
@@ -85,7 +85,7 @@ static public function define_decode_rules() {
* pdfannotator logs. It must return one array
* of {@see restore_log_rule} objects
*/
- static public function define_restore_log_rules() {
+ public static function define_restore_log_rules() {
$rules = array();
$rules[] = new restore_log_rule('pdfannotator', 'add', 'view.php?id={course_module}', '{pdfannotator}');
@@ -105,7 +105,7 @@ static public function define_restore_log_rules() {
* by the restore final task, but are defined here at
* activity level. All them are rules not linked to any module instance (cmid = 0)
*/
- static public function define_restore_log_rules_for_course() {
+ public static function define_restore_log_rules_for_course() {
$rules = array();
$rules[] = new restore_log_rule('pdfannotator', 'view all', 'index.php?id={course}', null);
diff --git a/classes/event/report_added.php b/classes/event/report_added.php
index e0f3384..affbd35 100644
--- a/classes/event/report_added.php
+++ b/classes/event/report_added.php
@@ -54,4 +54,4 @@ public function get_description() {
public function get_url() {
return new \moodle_url('/mod/pdfannotator/view.php', array('id' => $this->other['cmid'], 'action' => 'overview'));
}
-}
\ No newline at end of file
+}
diff --git a/classes/output/comment.php b/classes/output/comment.php
index 65286e0..b212b83 100644
--- a/classes/output/comment.php
+++ b/classes/output/comment.php
@@ -17,6 +17,8 @@
namespace mod_pdfannotator\output;
use moodle_url;
+defined('MOODLE_INTERNAL') || die();
+
/**
* Renderable for comments.
*
@@ -25,8 +27,6 @@
* @author Friederike Schwager
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
-defined('MOODLE_INTERNAL') || die();
-
class comment implements \renderable, \templatable {
private $comments = [];
diff --git a/classes/output/printview.php b/classes/output/printview.php
index 5fa9b3f..b6bbff0 100644
--- a/classes/output/printview.php
+++ b/classes/output/printview.php
@@ -52,4 +52,4 @@ public function export_for_template(\renderer_base $output) {
return $data;
}
-}
\ No newline at end of file
+}
diff --git a/classes/privacy/provider.php b/classes/privacy/provider.php
index e85dea9..633817e 100644
--- a/classes/privacy/provider.php
+++ b/classes/privacy/provider.php
@@ -440,4 +440,4 @@ public static function empty_or_delete_comment($comment) {
}
}
-}
\ No newline at end of file
+}
diff --git a/constants.php b/constants.php
index d633bab..803c5a8 100644
--- a/constants.php
+++ b/constants.php
@@ -16,7 +16,7 @@
/**
* @package mod_pdfannotator
* @copyright 2018 RWTH Aachen (see README.md)
- * @author Rabea de Groot, Anna Heynkes, Friederike Schwager
+ * @author Rabea de Groot, Anna Heynkes, Friederike Schwager
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
@@ -36,6 +36,6 @@
/**
- * Prefix needed for encode64 imaged
+ * Prefix needed for encode64 images
*/
-define('IMAGE_PREFIX', 'data:image/png;base64,');
\ No newline at end of file
+define('IMAGE_PREFIX', 'data:image/png;base64,');
diff --git a/controller.php b/controller.php
index 27515bb..42fecda 100644
--- a/controller.php
+++ b/controller.php
@@ -17,7 +17,7 @@
/**
* @package mod_pdfannotator
* @copyright 2018 RWTH Aachen (see README.md)
- * @author Anna Heynkes, Friederike Schwager
+ * @author Anna Heynkes, Friederike Schwager
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
@@ -570,4 +570,4 @@
$mform->display();
}
return;
-}
\ No newline at end of file
+}
diff --git a/db/events.php b/db/events.php
index 933baf5..72330f6 100644
--- a/db/events.php
+++ b/db/events.php
@@ -14,4 +14,4 @@
// You should have received a copy of the GNU General Public License
// along with Moodle. If not, see .
-defined('MOODLE_INTERNAL') || die();
\ No newline at end of file
+defined('MOODLE_INTERNAL') || die();
diff --git a/db/messages.php b/db/messages.php
index d9483ec..f9c94b8 100644
--- a/db/messages.php
+++ b/db/messages.php
@@ -51,4 +51,4 @@
'capability' => 'mod/pdfannotator:getforwardedquestions', // Teacher capability.
)
-);
\ No newline at end of file
+);
diff --git a/forward_form.php b/forward_form.php
index 98b1301..45d0075 100644
--- a/forward_form.php
+++ b/forward_form.php
@@ -1,88 +1,3 @@
-<<<<<<< HEAD
-.
-/**
- * @package mod_pdfannotator
- * @copyright 2019 RWTH Aachen (see README.md)
- * @author Friederike Schwager
- * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- *
- */
-defined('MOODLE_INTERNAL') || die();
-
-require_once($CFG->libdir . '/formslib.php');
-
-/**
- * Description of reportform
- *
- * @author Admin
- */
-class pdfannotator_forward_form extends moodleform {
-
- public function definition() {
- global $CFG;
-
- $mform = $this->_form; // Don't forget the underscore!
- // Pass contextual parameters to the form (via set_data() in controller.php)
- // Course module id.
- $mform->addElement('hidden', 'id');
- $mform->setType('id', PARAM_INT);
- // Course id.
- $mform->addElement('hidden', 'course');
- $mform->setType('course', PARAM_INT);
- // Pdf id.
- $mform->addElement('hidden', 'pdfannotatorid');
- $mform->setType('pdfannotatorid', PARAM_INT);
- // Pdfname.
- $mform->addElement('hidden', 'pdfname');
- $mform->setType('pdfname', PARAM_TEXT);
- // Comment id.
- $mform->addElement('hidden', 'commentid');
- $mform->setType('commentid', PARAM_INT);
- // Action = 'forwardquestion'.
- $mform->addElement('hidden', 'action');
- $mform->setType('action', PARAM_ALPHA);
-
- // Display question.
- $comment = $this->_customdata['comment'];
- $mform->addElement('static', 'description', get_string('question', 'pdfannotator'), $comment->content);
-
- // Select recipients.
- $recipients = $this->_customdata['recipients'];
-
- // 'selectgroups' instead of 'select' because the required-rule didn't work properly with a multi-select.
- $select = $mform->addElement('selectgroups', 'recipients', get_string('recipient', 'pdfannotator'));
- $select->addOptGroup('', $recipients);
- $select->setMultiple(true);
- $mform->addHelpButton('recipients', 'recipient', 'pdfannotator');
- $mform->addRule('recipients', get_string('recipientrequired', 'pdfannotator'), 'required', null, 'client');
-
- // Textarea for message to the recipient.
- $mform->addElement('textarea', 'message', get_string('messageforwardform', 'pdfannotator'), 'wrap="virtual" rows="5" cols="109"');
-
- // Add submit and cancel buttons.
- $this->add_action_buttons($cancel = true, get_string('send', 'pdfannotator'));
- }
-
- public function display() {
- $this->_form->display();
- }
-
-}
-=======
footer();
\ No newline at end of file
+echo $OUTPUT->footer();
diff --git a/lang/en/pdfannotator.php b/lang/en/pdfannotator.php
index 533a49d..f06bb51 100644
--- a/lang/en/pdfannotator.php
+++ b/lang/en/pdfannotator.php
@@ -17,7 +17,7 @@
/**
* @package mod_pdfannotator
* @copyright 2018 RWTH Aachen (see README.md)
- * @author Rabea de Groot, Anna Heynkes, Friederike Schwager
+ * @author Rabea de Groot, Anna Heynkes, Friederike Schwager
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*
*/
diff --git a/lib.php b/lib.php
index 060c37a..85b0433 100644
--- a/lib.php
+++ b/lib.php
@@ -16,7 +16,7 @@
/**
* @package mod_pdfannotator
* @copyright 2018 RWTH Aachen (see README.md)
- * @author Ahmad Obeid, Rabea de Groot, Anna Heynkes
+ * @author Ahmad Obeid, Rabea de Groot, Anna Heynkes
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
defined('MOODLE_INTERNAL') || die;
@@ -28,12 +28,18 @@
*/
function pdfannotator_supports($feature) {
switch($feature) {
- case FEATURE_GROUPS: return true;
- case FEATURE_GROUPINGS: return true;
- case FEATURE_MOD_INTRO: return true;
- case FEATURE_COMPLETION_TRACKS_VIEWS: return true;
- case FEATURE_BACKUP_MOODLE2: return true;
- case FEATURE_SHOW_DESCRIPTION: return true;
+ case FEATURE_GROUPS:
+ return true;
+ case FEATURE_GROUPINGS:
+ return true;
+ case FEATURE_MOD_INTRO:
+ return true;
+ case FEATURE_COMPLETION_TRACKS_VIEWS:
+ return true;
+ case FEATURE_BACKUP_MOODLE2:
+ return true;
+ case FEATURE_SHOW_DESCRIPTION:
+ return true;
default:
return null;
@@ -608,7 +614,7 @@ function pdfannotator_get_recent_mod_activity(&$activities, &$index, $timestart,
$printposts = array();
$context = context_course::instance($courseid);
foreach ($posts as $post) {
- if(!pdfannotator_can_see_comment($post, $context)) {
+ if (!pdfannotator_can_see_comment($post, $context)) {
continue;
}
$printposts[] = $post;
diff --git a/locallib.php b/locallib.php
index 6a31d57..e01ead4 100644
--- a/locallib.php
+++ b/locallib.php
@@ -16,7 +16,7 @@
/**
* @package mod_pdfannotator
* @copyright 2018 RWTH Aachen (see README)
- * @author Rabea de Groot, Anna Heynkes, Friederike Schwager
+ * @author Rabea de Groot, Anna Heynkes, Friederike Schwager
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
@@ -1805,4 +1805,4 @@ function pdfannotator_count_answers($annotationid, $context) {
$count++;
}
return $count;
-}
\ No newline at end of file
+}
diff --git a/mod_form.php b/mod_form.php
index 5a831b3..cf4f7fd 100644
--- a/mod_form.php
+++ b/mod_form.php
@@ -65,7 +65,8 @@ public function definition() {
$filemanageroptions['maxfiles'] = 1; // Upload only one file.
$filemanageroptions['mainfile'] = true;
- $mform->addElement('filemanager', 'files', get_string('setting_fileupload', 'pdfannotator'), null, $filemanageroptions); // Params: 1. type of the element, 2. (html) elementname, 3. label.
+ $mform->addElement('filemanager', 'files', get_string('setting_fileupload', 'pdfannotator'), null,
+ $filemanageroptions); // Params: 1. type of the element, 2. (html) elementname, 3. label.
$mform->addHelpButton('files', 'setting_fileupload', 'pdfannotator');
$mform->addElement('advcheckbox', 'usevotes', get_string('setting_usevotes', 'pdfannotator'),
@@ -87,22 +88,26 @@ public function definition() {
$mform->addHelpButton('use_studentdrawing', 'setting_use_studentdrawing', 'pdfannotator');
// XXX second checkbox or change to select.
- $mform->addElement('advcheckbox', 'useprint', get_string('setting_useprint_document', 'pdfannotator'), get_string('useprint', 'pdfannotator'), null, array(0, 1));
+ $mform->addElement('advcheckbox', 'useprint', get_string('setting_useprint_document', 'pdfannotator'),
+ get_string('useprint', 'pdfannotator'), null, array(0, 1));
$mform->setType('useprint', PARAM_BOOL);
$mform->setDefault('useprint', $config->useprint);
$mform->addHelpButton('useprint', 'setting_useprint_document', 'pdfannotator');
- $mform->addElement('advcheckbox', 'useprintcomments', get_string('setting_useprint_comments', 'pdfannotator'), get_string('useprint_comments', 'pdfannotator'), null, array(0, 1));
+ $mform->addElement('advcheckbox', 'useprintcomments', get_string('setting_useprint_comments', 'pdfannotator'),
+ get_string('useprint_comments', 'pdfannotator'), null, array(0, 1));
$mform->setType('useprintcomments', PARAM_BOOL);
$mform->setDefault('useprintcomments', $config->useprintcomments);
$mform->addHelpButton('useprintcomments', 'setting_useprint_comments', 'pdfannotator');
- $mform->addElement('advcheckbox', 'useprivatecomments', get_string('setting_use_private_comments', 'pdfannotator'), get_string('use_private_comments', 'pdfannotator'), null, array(0, 1));
+ $mform->addElement('advcheckbox', 'useprivatecomments', get_string('setting_use_private_comments', 'pdfannotator'),
+ get_string('use_private_comments', 'pdfannotator'), null, array(0, 1));
$mform->setType('useprivatecomments', PARAM_BOOL);
$mform->setDefault('useprivatecomments', $config->use_private_comments);
$mform->addHelpButton('useprivatecomments', 'setting_use_private_comments', 'pdfannotator');
- $mform->addElement('advcheckbox', 'useprotectedcomments', get_string('setting_use_protected_comments', 'pdfannotator'), get_string('use_protected_comments', 'pdfannotator'), null, array(0, 1));
+ $mform->addElement('advcheckbox', 'useprotectedcomments', get_string('setting_use_protected_comments', 'pdfannotator'),
+ get_string('use_protected_comments', 'pdfannotator'), null, array(0, 1));
$mform->setType('useprotectedcomments', PARAM_BOOL);
$mform->setDefault('useprotectedcomments', $config->use_protected_comments);
$mform->addHelpButton('useprotectedcomments', 'setting_use_protected_comments', 'pdfannotator');
diff --git a/model/annotation.class.php b/model/annotation.class.php
index 0eebb90..fb416f4 100644
--- a/model/annotation.class.php
+++ b/model/annotation.class.php
@@ -22,7 +22,7 @@
*
* @package mod_pdfannotator
* @copyright 2018 RWTH Aachen (see README.md)
- * @author Rabea de Groot, Anna Heynkes and Friederike Schwager
+ * @author Rabea de Groot, Anna Heynkes and Friederike Schwager
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*
*/
@@ -163,7 +163,8 @@ public static function deletion_allowed($annotation, $cmid) {
} else if (($author !== $userid) || !$deleteown) {
$result[] = false;
$result[] = get_string('onlyDeleteOwnAnnotations', 'pdfannotator');
- } else if ($DB->record_exists_select('pdfannotator_comments', "annotationid = ? AND userid != ?", [$annotation->id, $userid])) { // Check whether other people have commented this annotation.)
+ } else if ($DB->record_exists_select('pdfannotator_comments', "annotationid = ? AND userid != ?",
+ [$annotation->id, $userid])) { // Check whether other people have commented this annotation.
$result[] = false;
$result[] = get_string('onlyDeleteUncommentedPosts', 'pdfannotator');
} else {
@@ -191,7 +192,8 @@ public static function shifting_allowed($annotationid, $context) {
}
if (!$editownpost || $USER->id != self::get_author($annotationid)) {
return false;
- } else if ($DB->record_exists_select('pdfannotator_comments', "annotationid = ? AND userid != ?", array($annotationid, $USER->id))) {
+ } else if ($DB->record_exists_select('pdfannotator_comments', "annotationid = ? AND userid != ?",
+ array($annotationid, $USER->id))) {
// Annotation was answered by other users.
return false;
}
diff --git a/model/comment.class.php b/model/comment.class.php
index df5dd1f..b282c6b 100644
--- a/model/comment.class.php
+++ b/model/comment.class.php
@@ -16,7 +16,7 @@
/**
* @package mod_pdfannotator
* @copyright 2018 RWTH Aachen (see README.md)
- * @author Rabea de Groot, Anna Heynkes and Friederike Schwager
+ * @author Rabea de Groot, Anna Heynkes and Friederike Schwager
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*
*/
@@ -109,16 +109,19 @@ public static function create($documentid, $annotationid, $content, $visibility,
'&annoid=' . $annotationid . '&commid=' . $commentuuid;
$messagetext = new stdClass();
- $messagetext->text = pdfannotator_format_notification_message_text($course, $cm, $context, get_string('modulename', 'pdfannotator'), $modulename, $question, 'newquestion');
+ $messagetext->text = pdfannotator_format_notification_message_text($course, $cm, $context,
+ get_string('modulename', 'pdfannotator'), $modulename, $question, 'newquestion');
$messagetext->url = $question->urltoanswer;
foreach ($recipients as $recipient) {
- if (!pdfannotator_can_see_comment($datarecord, $context) ){
+ if (!pdfannotator_can_see_comment($datarecord, $context)) {
continue;
}
if ($recipient->id == $USER->id) {
continue;
}
- $messagetext->html = pdfannotator_format_notification_message_html($course, $cm, $context, get_string('modulename', 'pdfannotator'), $modulename, $question, 'newquestion', $recipient->id);
+ $messagetext->html = pdfannotator_format_notification_message_html($course, $cm, $context,
+ get_string('modulename', 'pdfannotator'), $modulename, $question, 'newquestion',
+ $recipient->id);
$messageid = pdfannotator_notify_manager($recipient, $course, $cm, 'newquestion', $messagetext, $anonymous);
}
@@ -143,10 +146,12 @@ public static function read($documentid, $annotationid, $context) {
global $DB, $USER;
// Get the ids and text content of all comments attached to this annotation/highlight.
- $sql = "SELECT c.id, c.content, c.userid, c.visibility, c.isquestion, c.isdeleted, c.ishidden, c.timecreated, c.timemodified, c.modifiedby, c.solved, c.annotationid, SUM(vote) AS votes "
+ $sql = "SELECT c.id, c.content, c.userid, c.visibility, c.isquestion, c.isdeleted, c.ishidden, c.timecreated, "
+ . "c.timemodified, c.modifiedby, c.solved, c.annotationid, SUM(vote) AS votes "
. "FROM {pdfannotator_comments} c LEFT JOIN {pdfannotator_votes} v"
. " ON c.id=v.commentid WHERE annotationid = ?"
- . " GROUP BY c.id, c.content, c.userid, c.visibility, c.isquestion, c.isdeleted, c.ishidden, c.timecreated, c.timemodified, c.modifiedby, c.solved, c.annotationid"
+ . " GROUP BY c.id, c.content, c.userid, c.visibility, c.isquestion, c.isdeleted, c.ishidden, c.timecreated, "
+ . "c.timemodified, c.modifiedby, c.solved, c.annotationid"
. " ORDER BY c.timecreated";
$a = array();
$a[] = $annotationid;
@@ -466,7 +471,7 @@ public static function insert_subscription($annotationid, $context) {
if ($DB->record_exists('pdfannotator_subscriptions', array('annotationid' => $annotationid, 'userid' => $USER->id))) {
return false;
}
-
+
$comment = $DB->get_record('pdfannotator_comments', array('annotationid' => $annotationid, 'isquestion' => '1'));
if (!pdfannotator_can_see_comment($comment, $context)) {
return false;
@@ -476,7 +481,6 @@ public static function insert_subscription($annotationid, $context) {
$datarecord->annotationid = $annotationid;
$datarecord->userid = $USER->id;
-
$subscriptionid = $DB->insert_record('pdfannotator_subscriptions', $datarecord, $returnid = true);
return $subscriptionid;
}
diff --git a/renderer.php b/renderer.php
index 113be11..4174c28 100644
--- a/renderer.php
+++ b/renderer.php
@@ -17,7 +17,7 @@
/**
* @package mod_pdfannotator
* @copyright 2018 RWTH Aachen (see README.md)
- * @author Rabea de Groot and Anna Heynkes
+ * @author Rabea de Groot and Anna Heynkes
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*
*/
diff --git a/version.php b/version.php
index 5af5b79..93bb2d7 100644
--- a/version.php
+++ b/version.php
@@ -14,21 +14,6 @@
// You should have received a copy of the GNU General Public License
// along with Moodle. If not, see .
-// 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 .
-
/**
* Version information for mod/pdfannotator
*
diff --git a/view.php b/view.php
index 93409b6..d51af8f 100644
--- a/view.php
+++ b/view.php
@@ -16,7 +16,7 @@
/**
* @package mod_pdfannotator
* @copyright 2018 RWTH Aachen (see README.md)
- * @author Ahmad Obeid, Anna Heynkes
+ * @author Ahmad Obeid, Anna Heynkes
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
require('../../config.php');