| @@ -320,7 +320,7 @@ | ||
| 320 | 320 | |
| 321 | 321 |      $cohorts = $DB->get_records('relationship_cohorts', array('relationshipid' => $relationship->id)); | 
| 322 | 322 | |
| 323 | -    if(count($cohorts) == 0) { | |
| 323 | +    if (count($cohorts) == 0) { | |
| 324 | 324 | |
| 325 | 325 |          $relationshipgroups = $DB->get_records('relationship_groups', array('relationshipid' => $relationship->id)); | 
| 326 | 326 |          foreach ($relationshipgroups AS $g) { | 
| @@ -284,7 +284,7 @@ | ||
| 284 | 284 | * Update existing relationship | 
| 285 | 285 | * | 
| 286 | 286 | * @param sstdClass $relationship | 
| 287 | - * @return void | |
| 287 | + * @return boolean | |
| 288 | 288 | */ | 
| 289 | 289 |  function relationship_update_relationship($relationship) { | 
| 290 | 290 | global $DB; | 
| @@ -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 | |
| @@ -68,8 +68,8 @@ discard block | ||
| 68 | 68 |          get_string('cohort', 'cohort'), | 
| 69 | 69 |          get_string('size'), | 
| 70 | 70 |          get_string('role'), | 
| 71 | -        get_string('allowdupsingroups', 'local_relationship').$OUTPUT->help_icon('allowdupsingroups', 'local_relationship'), | |
| 72 | -        get_string('uniformdistribute', 'local_relationship').$OUTPUT->help_icon('uniformdistribute', 'local_relationship'), | |
| 71 | +        get_string('allowdupsingroups', 'local_relationship') . $OUTPUT->help_icon('allowdupsingroups', 'local_relationship'), | |
| 72 | +        get_string('uniformdistribute', 'local_relationship') . $OUTPUT->help_icon('uniformdistribute', 'local_relationship'), | |
| 73 | 73 |          get_string('edit') | 
| 74 | 74 | ); | 
| 75 | 75 | $table->colclasses = array( | 
| @@ -21,10 +21,10 @@ | ||
| 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_once($CFG->dirroot.'/course/lib.php'); | |
| 26 | -require($CFG->dirroot.'/local/relationship/lib.php'); | |
| 27 | -require_once($CFG->dirroot.'/local/relationship/locallib.php'); | |
| 24 | +require_once(__DIR__ . '/../../config.php'); | |
| 25 | +require_once($CFG->dirroot . '/course/lib.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 | |
| @@ -44,7 +44,7 @@ discard block | ||
| 44 | 44 | |
| 45 | 45 | list($usercondition, $params) = users_search_sql($search, 'u', $this->searchanywhere); | 
| 46 | 46 | |
| 47 | -        if(!empty($this->validatinguserids)) { | |
| 47 | +        if (!empty($this->validatinguserids)) { | |
| 48 | 48 | list($usertest, $userparams) = $DB->get_in_or_equal($this->validatinguserids, SQL_PARAMS_NAMED, 'val'); | 
| 49 | 49 | $usercondition .= " AND u.id*1000000+rc.id " . $usertest; | 
| 50 | 50 | $params = array_merge($params, $userparams); | 
| @@ -61,7 +61,7 @@ discard block | ||
| 61 | 61 | WHERE rm.relationshipgroupid = :relationshipgroupid | 
| 62 | 62 |                    AND {$usercondition}"; | 
| 63 | 63 | |
| 64 | - $orderby= "ORDER BY roleid, fullname"; | |
| 64 | + $orderby = "ORDER BY roleid, fullname"; | |
| 65 | 65 | |
| 66 | 66 |          if (!$this->is_validating()) { | 
| 67 | 67 | $sql = $countfields . "\n" . $from; | 
| @@ -73,13 +73,13 @@ discard block | ||
| 73 | 73 | } | 
| 74 | 74 | } | 
| 75 | 75 | |
| 76 | - $sql = $selectfields . "\n" . $from . "\n" . $orderby; | |
| 76 | + $sql = $selectfields . "\n" . $from . "\n" . $orderby; | |
| 77 | 77 | |
| 78 | 78 | $users = array(); | 
| 79 | 79 | $roleid = -1; | 
| 80 | 80 | $index = false; | 
| 81 | -        foreach($DB->get_recordset_sql($sql, $params) AS $cand) { | |
| 82 | -            if($cand->roleid != $roleid) { | |
| 81 | +        foreach ($DB->get_recordset_sql($sql, $params) AS $cand) { | |
| 82 | +            if ($cand->roleid != $roleid) { | |
| 83 | 83 |                  $role = $DB->get_record('role', array('id'=>$cand->roleid), '*', MUST_EXIST); | 
| 84 | 84 | $index = role_get_name($role); | 
| 85 | 85 | $users[$index] = array(); | 
| @@ -23,7 +23,7 @@ | ||
| 23 | 23 | |
| 24 | 24 |  defined('MOODLE_INTERNAL') || die(); | 
| 25 | 25 | |
| 26 | -require_once($CFG->dirroot.'/local/relationship/lib.php'); | |
| 26 | +require_once($CFG->dirroot . '/local/relationship/lib.php'); | |
| 27 | 27 | |
| 28 | 28 | /** | 
| 29 | 29 | * Event handler for relationship local plugin. | 
| @@ -24,7 +24,7 @@ discard block | ||
| 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 | /** | 
| 30 | 30 | * Auto group form class | 
| @@ -40,7 +40,7 @@ discard block | ||
| 40 | 40 |      function definition() { | 
| 41 | 41 | global $DB; | 
| 42 | 42 | |
| 43 | - $mform =& $this->_form; | |
| 43 | + $mform = & $this->_form; | |
| 44 | 44 | |
| 45 | 45 | $relationshipid = $this->_customdata['relationshipid']; | 
| 46 | 46 | |
| @@ -24,7 +24,7 @@ discard block | ||
| 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_cohort extends \moodleform { | 
| 30 | 30 | |
| @@ -35,19 +35,19 @@ discard block | ||
| 35 | 35 | |
| 36 | 36 | $cohorts = relationship_get_cohort_options($relationshipcohort->relationshipid); | 
| 37 | 37 | $relationshipcohorts = relationship_get_cohorts($relationshipcohort->relationshipid); | 
| 38 | -        foreach($relationshipcohorts AS $rc) { | |
| 38 | +        foreach ($relationshipcohorts AS $rc) { | |
| 39 | 39 | unset($cohorts[$rc->cohortid]); | 
| 40 | 40 | } | 
| 41 | 41 | |
| 42 | 42 |          $mform->addElement('select', 'cohortid', get_string('cohort', 'cohort'), $cohorts); | 
| 43 | 43 | |
| 44 | 44 | $roles = relationship_get_role_options(); | 
| 45 | -        foreach($relationshipcohorts AS $rc) { | |
| 45 | +        foreach ($relationshipcohorts AS $rc) { | |
| 46 | 46 | unset($roles[$rc->roleid]); | 
| 47 | 47 | } | 
| 48 | 48 |          $mform->addElement('select', 'roleid', get_string('role'), $roles); | 
| 49 | 49 | |
| 50 | -        if($relationshipcohort->id) { | |
| 50 | +        if ($relationshipcohort->id) { | |
| 51 | 51 |              $mform->freeze('roleid'); | 
| 52 | 52 |              $mform->freeze('cohortid'); | 
| 53 | 53 | } | 
| @@ -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 | |
| @@ -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 | |