@@ -38,7 +38,7 @@ discard block |
||
| 38 | 38 | |
| 39 | 39 | list($usercondition, $params) = users_search_sql($search, 'u', $this->searchanywhere); |
| 40 | 40 | |
| 41 | - if(!empty($this->validatinguserids)) { |
|
| 41 | + if (!empty($this->validatinguserids)) { |
|
| 42 | 42 | list($usertest, $userparams) = $DB->get_in_or_equal($this->validatinguserids, SQL_PARAMS_NAMED, 'val'); |
| 43 | 43 | $usercondition .= " AND u.id*1000000+rc.id " . $usertest; |
| 44 | 44 | $params = array_merge($params, $userparams); |
@@ -66,7 +66,7 @@ discard block |
||
| 66 | 66 | OR (rc.allowdupsingroups = 0 AND rm.id IS NULL)) |
| 67 | 67 | AND {$usercondition}"; |
| 68 | 68 | |
| 69 | - $orderby= "ORDER BY roleid, in_group, fullname"; |
|
| 69 | + $orderby = "ORDER BY roleid, in_group, fullname"; |
|
| 70 | 70 | |
| 71 | 71 | if (!$this->is_validating()) { |
| 72 | 72 | $sql = $countfields . "\n" . $from; |
@@ -78,18 +78,18 @@ discard block |
||
| 78 | 78 | } |
| 79 | 79 | } |
| 80 | 80 | |
| 81 | - $sql = $selectfields . "\n" . $from . "\n" . $orderby; |
|
| 81 | + $sql = $selectfields . "\n" . $from . "\n" . $orderby; |
|
| 82 | 82 | |
| 83 | 83 | $users = array(); |
| 84 | 84 | $roleid = -1; |
| 85 | 85 | $in_group = -1; |
| 86 | 86 | $index = false; |
| 87 | - foreach($DB->get_recordset_sql($sql, $params) AS $cand) { |
|
| 88 | - if($cand->roleid != $roleid || $cand->in_group != $in_group) { |
|
| 87 | + foreach ($DB->get_recordset_sql($sql, $params) AS $cand) { |
|
| 88 | + if ($cand->roleid != $roleid || $cand->in_group != $in_group) { |
|
| 89 | 89 | $role = $DB->get_record('role', array('id'=>$cand->roleid), '*', MUST_EXIST); |
| 90 | 90 | $role_name = role_get_name($role); |
| 91 | 91 | |
| 92 | - $str_alloc = $cand->in_group == 1 ? get_string('allocated', 'local_relationship') : get_string('notallocated', 'local_relationship'); |
|
| 92 | + $str_alloc = $cand->in_group == 1 ? get_string('allocated', 'local_relationship') : get_string('notallocated', 'local_relationship'); |
|
| 93 | 93 | $index = $role_name . $str_alloc; |
| 94 | 94 | $users[$index] = array(); |
| 95 | 95 | |
@@ -21,9 +21,9 @@ discard block |
||
| 21 | 21 | * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later |
| 22 | 22 | */ |
| 23 | 23 | |
| 24 | -require_once(__DIR__.'/../../config.php'); |
|
| 25 | -require($CFG->dirroot.'/local/relationship/lib.php'); |
|
| 26 | -require_once($CFG->dirroot.'/local/relationship/locallib.php'); |
|
| 24 | +require_once(__DIR__ . '/../../config.php'); |
|
| 25 | +require($CFG->dirroot . '/local/relationship/lib.php'); |
|
| 26 | +require_once($CFG->dirroot . '/local/relationship/locallib.php'); |
|
| 27 | 27 | |
| 28 | 28 | require_login(); |
| 29 | 29 | |
@@ -98,13 +98,13 @@ discard block |
||
| 98 | 98 | <td id="buttonscell"> |
| 99 | 99 | <div id="addcontrols"> |
| 100 | 100 | <input name="add" id="add" type="submit" |
| 101 | - value="<?php echo $OUTPUT->larrow().' '.s(get_string('add')); ?>" |
|
| 101 | + value="<?php echo $OUTPUT->larrow() . ' ' . s(get_string('add')); ?>" |
|
| 102 | 102 | title="<?php p(get_string('add')); ?>"/><br/> |
| 103 | 103 | </div> |
| 104 | 104 | |
| 105 | 105 | <div id="removecontrols"> |
| 106 | 106 | <input name="remove" id="remove" type="submit" |
| 107 | - value="<?php echo s(get_string('remove')).' '.$OUTPUT->rarrow(); ?>" |
|
| 107 | + value="<?php echo s(get_string('remove')) . ' ' . $OUTPUT->rarrow(); ?>" |
|
| 108 | 108 | title="<?php p(get_string('remove')); ?>"/> |
| 109 | 109 | </div> |
| 110 | 110 | </td> |
@@ -22,9 +22,9 @@ discard block |
||
| 22 | 22 | * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later |
| 23 | 23 | */ |
| 24 | 24 | |
| 25 | -require_once(__DIR__.'/../../config.php'); |
|
| 26 | -require($CFG->dirroot.'/local/relationship/lib.php'); |
|
| 27 | -require_once($CFG->dirroot.'/local/relationship/locallib.php'); |
|
| 25 | +require_once(__DIR__ . '/../../config.php'); |
|
| 26 | +require($CFG->dirroot . '/local/relationship/lib.php'); |
|
| 27 | +require_once($CFG->dirroot . '/local/relationship/locallib.php'); |
|
| 28 | 28 | |
| 29 | 29 | require_login(); |
| 30 | 30 | $contextid = required_param('contextid', PARAM_INT); |
@@ -61,9 +61,9 @@ discard block |
||
| 61 | 61 | $count = ''; |
| 62 | 62 | if ($relationships['allrelationships'] > 0) { |
| 63 | 63 | if ($searchquery === '') { |
| 64 | - $count = ' ('.$relationships['allrelationships'].')'; |
|
| 64 | + $count = ' (' . $relationships['allrelationships'] . ')'; |
|
| 65 | 65 | } else { |
| 66 | - $count = ' ('.$relationships['totalrelationships'].'/'.$relationships['allrelationships'].')'; |
|
| 66 | + $count = ' (' . $relationships['totalrelationships'] . '/' . $relationships['allrelationships'] . ')'; |
|
| 67 | 67 | } |
| 68 | 68 | } |
| 69 | 69 | |
@@ -97,7 +97,7 @@ discard block |
||
| 97 | 97 | if ($course_count > 0) { |
| 98 | 98 | $url = new moodle_url('/local/relationship/index.php', array('contextid' => $contextid, 'relationshipid' => $relationship->id)); |
| 99 | 99 | $link = html_writer::link($url, get_string('list', 'local_relationship')); |
| 100 | - $line[] = $course_count.' ('.$link.')'; |
|
| 100 | + $line[] = $course_count . ' (' . $link . ')'; |
|
| 101 | 101 | } else { |
| 102 | 102 | $line[] = $course_count; |
| 103 | 103 | } |
@@ -21,10 +21,10 @@ discard block |
||
| 21 | 21 | * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later |
| 22 | 22 | */ |
| 23 | 23 | |
| 24 | -require_once(__DIR__.'/../../config.php'); |
|
| 25 | -require($CFG->dirroot.'/local/relationship/lib.php'); |
|
| 26 | -require_once($CFG->dirroot.'/local/relationship/locallib.php'); |
|
| 27 | -require_once($CFG->dirroot.'/group/lib.php'); |
|
| 24 | +require_once(__DIR__ . '/../../config.php'); |
|
| 25 | +require($CFG->dirroot . '/local/relationship/lib.php'); |
|
| 26 | +require_once($CFG->dirroot . '/local/relationship/locallib.php'); |
|
| 27 | +require_once($CFG->dirroot . '/group/lib.php'); |
|
| 28 | 28 | |
| 29 | 29 | require_login(); |
| 30 | 30 | |
@@ -104,9 +104,9 @@ discard block |
||
| 104 | 104 | $table->data = array(); |
| 105 | 105 | foreach ($new_groups as $group) { |
| 106 | 106 | if ($group['exists']) { |
| 107 | - $text = html_writer::tag('span', $group['name'], array('style' => 'color:red; font-weight: bold;')).get_string('alreadyexists', 'local_relationship'); |
|
| 107 | + $text = html_writer::tag('span', $group['name'], array('style' => 'color:red; font-weight: bold;')) . get_string('alreadyexists', 'local_relationship'); |
|
| 108 | 108 | } else if ($group['exists_external']) { |
| 109 | - $text = html_writer::tag('span', $group['name'], array('style' => 'color:red; font-weight: bold;')).get_string('alreadyexistsexternal', 'local_relationship'); |
|
| 109 | + $text = html_writer::tag('span', $group['name'], array('style' => 'color:red; font-weight: bold;')) . get_string('alreadyexistsexternal', 'local_relationship'); |
|
| 110 | 110 | } else { |
| 111 | 111 | $text = $group['name']; |
| 112 | 112 | } |
@@ -20,9 +20,9 @@ discard block |
||
| 20 | 20 | * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later |
| 21 | 21 | */ |
| 22 | 22 | |
| 23 | -require_once(__DIR__.'/../../config.php'); |
|
| 24 | -require($CFG->dirroot.'/local/relationship/lib.php'); |
|
| 25 | -require_once($CFG->dirroot.'/local/relationship/locallib.php'); |
|
| 23 | +require_once(__DIR__ . '/../../config.php'); |
|
| 24 | +require($CFG->dirroot . '/local/relationship/lib.php'); |
|
| 25 | +require_once($CFG->dirroot . '/local/relationship/locallib.php'); |
|
| 26 | 26 | |
| 27 | 27 | require_login(); |
| 28 | 28 | |
@@ -58,7 +58,7 @@ discard block |
||
| 58 | 58 | relationship_set_header($context, $baseurl, $relationship, 'cohorts'); |
| 59 | 59 | |
| 60 | 60 | if (optional_param('delete', 0, PARAM_BOOL) && $relationshipcohort->id) { |
| 61 | - $desc = format_string($relationshipcohort->role_name.'/'.$relationshipcohort->cohort->name); |
|
| 61 | + $desc = format_string($relationshipcohort->role_name . '/' . $relationshipcohort->cohort->name); |
|
| 62 | 62 | relationship_set_title($relationship, 'deletecohort', $desc); |
| 63 | 63 | echo $OUTPUT->notification(get_string('deletecohortwarning', 'local_relationship')); |
| 64 | 64 | $yesurl = new moodle_url('/local/relationship/edit_cohort.php', array('relationshipcohortid' => $relationshipcohort->id, 'relationshipid' => $relationship->id, 'delete' => 1, 'confirmedelete' => 1, 'sesskey' => sesskey())); |
@@ -82,7 +82,7 @@ discard block |
||
| 82 | 82 | } |
| 83 | 83 | |
| 84 | 84 | if ($relationshipcohort->id) { |
| 85 | - $desc = format_string($relationshipcohort->role_name.'/'.$relationshipcohort->cohort->name); |
|
| 85 | + $desc = format_string($relationshipcohort->role_name . '/' . $relationshipcohort->cohort->name); |
|
| 86 | 86 | relationship_set_title($relationship, 'editcohort', $desc); |
| 87 | 87 | } else { |
| 88 | 88 | relationship_set_title($relationship, 'addcohort'); |
@@ -21,10 +21,10 @@ discard block |
||
| 21 | 21 | * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later |
| 22 | 22 | */ |
| 23 | 23 | |
| 24 | -require_once(__DIR__.'/../../config.php'); |
|
| 25 | -require($CFG->dirroot.'/local/relationship/lib.php'); |
|
| 26 | -require_once($CFG->dirroot.'/local/relationship/locallib.php'); |
|
| 27 | -require_once($CFG->libdir.'/adminlib.php'); |
|
| 24 | +require_once(__DIR__ . '/../../config.php'); |
|
| 25 | +require($CFG->dirroot . '/local/relationship/lib.php'); |
|
| 26 | +require_once($CFG->dirroot . '/local/relationship/locallib.php'); |
|
| 27 | +require_once($CFG->libdir . '/adminlib.php'); |
|
| 28 | 28 | |
| 29 | 29 | require_login(); |
| 30 | 30 | |
@@ -64,7 +64,7 @@ discard block |
||
| 64 | 64 | } |
| 65 | 65 | if ($editable) { |
| 66 | 66 | $url = new moodle_url('/local/relationship/edit_group.php', array('relationshipgroupid' => $relationshipgroup->id, 'uniformdistribution' => $uniformdistribution)); |
| 67 | - $line[] = $status.' ('.html_writer::link($url, $text).')'; |
|
| 67 | + $line[] = $status . ' (' . html_writer::link($url, $text) . ')'; |
|
| 68 | 68 | } else { |
| 69 | 69 | $line[] = $status; |
| 70 | 70 | } |
@@ -87,8 +87,8 @@ discard block |
||
| 87 | 87 | $table = new html_table(); |
| 88 | 88 | $table->head = array(get_string('name', 'local_relationship'), |
| 89 | 89 | get_string('memberscount', 'local_relationship'), |
| 90 | - get_string('limit', 'local_relationship').$OUTPUT->help_icon('userlimit', 'local_relationship'), |
|
| 91 | - get_string('uniformdistribute', 'local_relationship').$OUTPUT->help_icon('uniformdistribute', 'local_relationship'), |
|
| 90 | + get_string('limit', 'local_relationship') . $OUTPUT->help_icon('userlimit', 'local_relationship'), |
|
| 91 | + get_string('uniformdistribute', 'local_relationship') . $OUTPUT->help_icon('uniformdistribute', 'local_relationship'), |
|
| 92 | 92 | get_string('edit')); |
| 93 | 93 | $table->colclasses = array('leftalign name', |
| 94 | 94 | 'leftalign size', |
@@ -135,7 +135,7 @@ discard block |
||
| 135 | 135 | |
| 136 | 136 | $addgroup = new single_button(new moodle_url('/local/relationship/edit_group.php', array('relationshipid' => $relationshipid)), get_string('addgroup', 'local_relationship')); |
| 137 | 137 | $addgroups = new single_button(new moodle_url('/local/relationship/autogroup.php', array('relationshipid' => $relationshipid)), get_string('autogroup', 'local_relationship')); |
| 138 | - echo html_writer::tag('div', $OUTPUT->render($addgroup).$OUTPUT->render($addgroups), array('class' => 'buttons')); |
|
| 138 | + echo html_writer::tag('div', $OUTPUT->render($addgroup) . $OUTPUT->render($addgroups), array('class' => 'buttons')); |
|
| 139 | 139 | } else if ($manager) { |
| 140 | 140 | echo $OUTPUT->heading(get_string('noeditable', 'local_relationship')); |
| 141 | 141 | } |
@@ -24,7 +24,7 @@ |
||
| 24 | 24 | namespace local_relationship\form; |
| 25 | 25 | defined('MOODLE_INTERNAL') || die(); |
| 26 | 26 | |
| 27 | -require_once($CFG->dirroot.'/lib/formslib.php'); |
|
| 27 | +require_once($CFG->dirroot . '/lib/formslib.php'); |
|
| 28 | 28 | |
| 29 | 29 | class edit_relationship extends \moodleform { |
| 30 | 30 | |