ELIS-8632: Peer Review change to check if multiple blockinstances exist and loop through all + language string 'datahub:addinstance'

Author: brentboghosian

Diff for: db/install.php

@@ -32,27 +32,30 @@ function xmldb_local_datahub_install() {
     $oldrecord = $DB->get_record('block', array('name' => 'rlip'), 'id');
     if (!empty($oldrecord)) {
         // Convert any existing old rlip block instances to html blocks.
-        $plugins = get_string('plugins', 'local_datahub');
-        $logs = get_string('logs', 'local_datahub');
-        $obj = new stdClass();
+        $oldblockinsts = $DB->get_recordset('block_instances', array('blockname' => 'rlip'), '', 'id');
+        if ($oldblockinsts && $oldblockinsts->valid()) {
+            $plugins = get_string('plugins', 'local_datahub');
+            $logs = get_string('logs', 'local_datahub');
+            $obj = new stdClass();
+            $pluginstag = html_writer::tag('a', $plugins, array('href' => $CFG->wwwroot.'/local/datahub/plugins.php', 'title' => $plugins));
+            $logstag = html_writer::tag('a', $logs, array('href' => $CFG->wwwroot.'/local/datahub/viewlogs.php', 'title' => $logs));
+            $obj->text = html_writer::tag('p', $pluginstag).html_writer::tag('p', $logstag);
+            $obj->title = get_string('pluginname', 'local_datahub');
+            $obj->format = 1;
+            $configdata = base64_encode(serialize($obj));
+            $sql = "UPDATE {block_instances} SET blockname = 'html', configdata = ? WHERE blockname = 'rlip'";
+            $DB->execute($sql, array($configdata));
 
-        $blockinstanceid = $DB->get_field('block_instances', 'id', array('blockname' => 'rlip'));
-
-        $pluginstag = html_writer::tag('a', $plugins, array('href' => $CFG->wwwroot.'/local/datahub/plugins.php', 'title' => $plugins));
-        $logstag = html_writer::tag('a', $logs, array('href' => $CFG->wwwroot.'/local/datahub/viewlogs.php', 'title' => $logs));
-        $obj->text = html_writer::tag('p', $pluginstag).html_writer::tag('p', $logstag);
-        $obj->title = get_string('pluginname', 'local_datahub');
-        $obj->format = 1;
-        $configdata = base64_encode(serialize($obj));
-        $sql = "UPDATE {block_instances} SET blockname = 'html', configdata = ? WHERE blockname = 'rlip'";
-        $DB->execute($sql, array($configdata));
-
-        $context = context_block::instance($blockinstanceid);
-        $cap = 'moodle/block:view';
-        $roles = get_roles_with_capability($cap, CAP_ALLOW, $context);
-        foreach ($roles as $role) {
-            if ($role->id != 1) {
-                assign_capability($cap, CAP_PREVENT, $role->id, $context->id);
+            // Hide blocks from all but site admins
+            $cap = 'moodle/block:view';
+            foreach ($oldblockinsts as $oldblockinst) {
+                $context = context_block::instance($oldblockinst->id);
+                $roles = get_roles_with_capability($cap, CAP_ALLOW, $context);
+                foreach ($roles as $role) {
+                    if ($role->id != 1) {
+                        assign_capability($cap, CAP_PREVENT, $role->id, $context->id);
+                    }
+                }
             }
         }
 

Diff for: lang/en/local_datahub.php

@@ -28,6 +28,7 @@
 $string['automatic'] = 'Automatic';
 $string['confirm_delete_ipjob'] = 'Are you sure to delete DH job #{$a}?';
 $string['configdisableincron'] = 'If enabled, this setting disables this plugin from running in the Moodle cron. Use this setting when running imports & exports via a separate system-level cron.';
+$string['datahub:addinstance'] = 'Add a DataHub instance';
 $string['datahub_settings'] = 'Datahub Settings';
 $string['dateformat'] = 'M/d/Y';
 $string['dblogimportexceedstimelimit'] = 'Failed importing all lines from import file {$a->filename} due to time limit exceeded. Processed {$a->recordsprocessed} of {$a->totalrecords} records.';