Merge branch 'master' into 42-ucl-rebase

Author: opitz

README.md

@@ -1,11 +1,12 @@
 # Open Forum Activity
-Open forums enhance Moodle Forums by providing teachers and students with quick, 
-simple views into the forums and their discussions. Allowing users to sort and search 
-discussions easily and in multiple layouts is key to Advanced Forums increased usability. 
-Read tracking is a feature in Advanced forums that highlights unread posts, 
-making it even easier to manage a forum. This saves the student time in viewing and 
-responding to posts, and saves the teacher time in finding the posts that are most 
-relevant to the class. Teachers are empowered to create anonymous interactions with 
+
+Open forums enhance Moodle Forums by providing teachers and students with quick,
+simple views into the forums and their discussions. Allowing users to sort and search
+discussions easily and in multiple layouts is key to Advanced Forums increased usability.
+Read tracking is a feature in Advanced forums that highlights unread posts,
+making it even easier to manage a forum. This saves the student time in viewing and
+responding to posts, and saves the teacher time in finding the posts that are most
+relevant to the class. Teachers are empowered to create anonymous interactions with
 students while still being able to provide accurate grading with advanced grading methods.
 
 ![local_hsuforum](https://moodle.org/pluginfile.php/50/local_plugins/plugin_description/399/recent%20posts.png)
@@ -16,11 +17,33 @@ schools and organizations by supporting the software that educators use to manag
 learners in virtual classrooms.
 
 ## Installation
+
 Extract the contents of the plugin into _/wwwroot/mod_ then visit `admin/upgrade.php` or use the CLI script to upgrade your site.
 
 For more information about the configuration and usage, please see http://docs.moodle.org/dev/Advanced_Forum
 
+## Flag
+
+### The `hsuforum_digestmailtime` flag.
+
+### The `hsuforum_allowforcedreadtracking` flag.
+
+### The `hsuforum_enabletimedposts` flag.
+
+### The `hsuforum_digestmailtimelast` flag.
+
+### The `mod_hsuforum_grading_interface` flag.
+
+### The `hsuforum_replytouser` flag.
+
+### The `hsuforum_subscription` flag.
+
+## Task
+
+### `cron_task`  scheduled  task .
+
 ## License
+
 Copyright (c) 2021 Open LMS (https://www.openlms.net)
 
 This program is free software: you can redistribute it and/or modify it under
@@ -33,4 +56,4 @@ 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
-this program.  If not, see <http://www.gnu.org/licenses/>.
+this program.  If not, see [http://www.gnu.org/licenses/](http://www.gnu.org/licenses/).

amd/build/accessibility.min.js

@@ -14,7 +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/>.
  *
- * @package   mod_hsuforum
  * @author    Rafael Becerra rafael.becerrarodriguez@openlms.net
  * @copyright Copyright (c) 2019 Open LMS (https://www.openlms.net)
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
@@ -42,6 +41,6 @@ define(['jquery'],
                     }
                 });
             }
-        }
+        };
     }
 );

amd/build/accessibility.min.js.map

@@ -70,7 +70,7 @@ public function export_action() {
         $mform = new export_form($this->new_url(), (object) array(
             'cm'    => $cm,
             'forum' => $PAGE->activityrecord,
-        ));
+        ), 'post', '', array('onreset' => ''));
 
         if ($mform->is_cancelled()) {
             redirect(new \moodle_url('/mod/hsuforum/view.php', array('id' => $cm->id)));

amd/src/accessibility.js

@@ -736,6 +736,7 @@
 $string['inprivatereplyto'] = 'in private reply to';
 $string['options'] = 'Options';
 $string['articledateformat'] = '%l:%M%P %b %e, %Y';
+$string['userdateformat'] = '%l:%M%P %b %e, %Y';
 $string['postdeleted'] = 'Post deleted';
 $string['postcreated'] = 'Post created';
 $string['cannnotdeletesinglediscussion'] = 'Sorry, but you are not allowed to delete that discussion!';

classes/controller/export_controller.php

@@ -4405,7 +4405,7 @@ function hsuforum_add_discussion($discussion, $mform=null, $unused=null, $userid
     $post->mailnow       = $discussion->mailnow;
     $post->reveal        = $discussion->reveal;
 
-    if (!is_null($mform) && method_exists((object) $mform, 'get_data')) {
+    if (is_object($mform)  && method_exists($mform, 'get_data')) {
         $data = $mform->get_data();
         if (!empty($data->reveal)) {
             $post->reveal = 1;

lang/en/hsuforum.php

@@ -228,7 +228,7 @@ public function disable($key) {
      * @return string the string representation of the object or &null;
      */
     public function serialize() {
-        return serialize(array('key' => $this->get_key(), 'direction' => $this->get_direction()));
+        return serialize($this->__serialize());
     }
 
     /**
@@ -242,11 +242,24 @@ public function serialize() {
      * @return void
      */
     public function unserialize($serialized) {
-        $sortinfo = unserialize($serialized);
+        $serialized = unserialize($serialized);
+        $this->__unserialize($serialized);
+    }
 
+    /**
+     * @return array
+     */
+    public function __serialize() {
+        return array('key' => $this->get_key(), 'direction' => $this->get_direction());
+    }
+
+    /**
+     * @return void
+     */
+    public function __unserialize($serialized) {
         try {
-            $this->set_key($sortinfo['key'])
-                 ->set_direction($sortinfo['direction']);
+            $this->set_key($serialized['key'])
+                ->set_direction($serialized['direction']);
         } catch (Exception $e) {
             // Ignore...
         }

lib.php

@@ -577,6 +577,16 @@
         $formheading = get_string('yournewquestion', 'hsuforum');
     } else {
         $formheading = get_string('yournewtopic', 'hsuforum');
+        // Hide duplicated hsuforum description when creating a new discussion topic, see INT-18928.
+        $hidehtml = '';
+        $hidehtml .= html_writer::start_tag('style', array('type' => 'text/css')) . "\n";
+        $hidehtml .= '
+        #page-mod-hsuforum-post .activity-description,
+        #page-mod-hsuforum-post [role="main"] h2 {
+            display: none;
+        };';
+        $hidehtml .= html_writer::end_tag('style') . "\n";
+        echo $hidehtml;
     }
 }
 

lib/discussion/sort.php

@@ -341,7 +341,7 @@ public function discussion($cm, $discussion, $post, $fullthread, array $posts =
         if (!property_exists($discussion, 'unread') or empty($discussion->unread)) {
             $discussion->unread = '-';
         }
-        $format = get_string('articledateformat', 'hsuforum');
+        $format = get_string('userdateformat', 'hsuforum');
 
         $groups = groups_get_all_groups($course->id, 0, $cm->groupingid);
         $group = '';
@@ -492,7 +492,7 @@ public function post($cm, $discussion, $post, $canreply = false, $parent = null,
         $data->fullname       = $postuser->fullname;
         $data->subject        = property_exists($post, 'breadcrumb') ? $post->breadcrumb : $this->raw_post_subject($post);
         $data->message        = $this->post_message($post, $cm, $search);
-        $data->created        = userdate($post->created, get_string('articledateformat', 'hsuforum'));
+        $data->created        = userdate($post->created, get_string('userdateformat', 'hsuforum'));
         $data->rawcreated     = $post->created;
         $data->privatereply   = $post->privatereply;
         $data->imagesrc       = $postuser->user_picture->get_url($this->page)->out();