Completed
Push — MOODLE_31_STABLE ( 5aefc8 )
by Roberto
17:45 queued 11:39
created
locallib.php 2 patches
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -45,7 +45,7 @@
 block discarded – undo
45 45
     $PAGE->navbar->add($navtitle, new moodle_url('/local/relationship/index.php', array('contextid'=>$context->id)));
46 46
     if($module) {
47 47
         $PAGE->navbar->add(get_string($module, 'local_relationship'),
48
-                           new moodle_url("/local/relationship/{$module}.php", array('relationshipid'=>$relationship->id)));
48
+                            new moodle_url("/local/relationship/{$module}.php", array('relationshipid'=>$relationship->id)));
49 49
     }
50 50
 }
51 51
 
Please login to merge, or discard this patch.
Spacing   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -26,7 +26,7 @@  discard block
 block discarded – undo
26 26
 require_once($CFG->dirroot . '/user/selector/lib.php');
27 27
 require_once($CFG->dirroot . '/tag/lib.php');
28 28
 
29
-function relationship_set_header($context, $url, $relationship=null, $module=null) {
29
+function relationship_set_header($context, $url, $relationship = null, $module = null) {
30 30
     global $PAGE, $COURSE, $DB;
31 31
 
32 32
     if ($context->contextlevel != CONTEXT_COURSECAT) {
@@ -43,27 +43,27 @@  discard block
 block discarded – undo
43 43
 
44 44
     $PAGE->navbar->add($category->name, new moodle_url('/course/index.php', array('categoryid'=>$category->id)));
45 45
     $PAGE->navbar->add($navtitle, new moodle_url('/local/relationship/index.php', array('contextid'=>$context->id)));
46
-    if($module) {
46
+    if ($module) {
47 47
         $PAGE->navbar->add(get_string($module, 'local_relationship'),
48 48
                            new moodle_url("/local/relationship/{$module}.php", array('relationshipid'=>$relationship->id)));
49 49
     }
50 50
 }
51 51
 
52
-function relationship_set_title($relationship=null, $action=null, $param=null) {
52
+function relationship_set_title($relationship = null, $action = null, $param = null) {
53 53
     global $OUTPUT;
54 54
 
55 55
     echo $OUTPUT->header();
56
-    if($relationship) {
56
+    if ($relationship) {
57 57
         echo $OUTPUT->heading(get_string('relationship', 'local_relationship') . ': ' . format_string($relationship->name));
58 58
         echo html_writer::empty_tag('BR');
59 59
     }
60
-    if($action) {
60
+    if ($action) {
61 61
         echo $OUTPUT->heading(get_string($action, 'local_relationship', $param), '4');
62 62
     }
63 63
 }
64 64
 
65
-function relationship_groups_parse_name($format, $value, $value_is_a_name=false) {
66
-    if($value_is_a_name) {
65
+function relationship_groups_parse_name($format, $value, $value_is_a_name = false) {
66
+    if ($value_is_a_name) {
67 67
         if (strstr($format, '@') !== false) {
68 68
             $str = str_replace('@', $value, $format);
69 69
         } else {
@@ -72,7 +72,7 @@  discard block
 block discarded – undo
72 72
     } else {
73 73
         if (strstr($format, '@') !== false) { // Convert $value to a character series
74 74
             $letter = 'A';
75
-            for($i=0; $i<$value; $i++) {
75
+            for ($i = 0; $i < $value; $i++) {
76 76
                 $letter++;
77 77
             }
78 78
             $str = str_replace('@', $letter, $format);
@@ -87,8 +87,8 @@  discard block
 block discarded – undo
87 87
     $all_roles = role_get_names();
88 88
     $ctx_roles = get_roles_for_contextlevels(CONTEXT_COURSE);
89 89
     $roles = array();
90
-    foreach($ctx_roles AS $id=>$roleid) {
91
-        if($roleid > 2) {
90
+    foreach ($ctx_roles AS $id=>$roleid) {
91
+        if ($roleid > 2) {
92 92
             $roles[$roleid] = $all_roles[$roleid]->localname;
93 93
         }
94 94
     }
@@ -103,7 +103,7 @@  discard block
 block discarded – undo
103 103
     $context = context::instance_by_id($relationship->contextid);
104 104
 
105 105
     $contextids = array();
106
-    foreach($context->get_parent_context_ids(true) as $ctxid) {
106
+    foreach ($context->get_parent_context_ids(true) as $ctxid) {
107 107
         $context = context::instance_by_id($ctxid);
108 108
         if (has_capability('moodle/cohort:view', $context)) {
109 109
             $contextids[] = $ctxid;
@@ -139,7 +139,7 @@  discard block
 block discarded – undo
139 139
                AND g.idnumber NOT LIKE 'relationship_{$relationshipid}_%'
140 140
           ORDER BY g.name";
141 141
     $groups = array();
142
-    foreach($DB->get_records_sql($sql, array('relationshipid'=>$relationshipid)) as $r) {
142
+    foreach ($DB->get_records_sql($sql, array('relationshipid'=>$relationshipid)) as $r) {
143 143
         $groups[$r->name][] = $r;
144 144
     }
145 145
     return $groups;
@@ -223,7 +223,7 @@  discard block
 block discarded – undo
223 223
     $allrelationships = $DB->count_records('relationship', array('contextid'=>$contextid));
224 224
     $totalrelationships = $DB->count_records_sql($countfields . $sql, $params);
225 225
     $relationships = $DB->get_records_sql($fields . $sql . $order, $params, $page*$perpage, $perpage);
226
-    foreach($relationships as $rl) {
226
+    foreach ($relationships as $rl) {
227 227
         $rl->tags = core_tag_tag::get_item_tags_array('relationship', 'relationship', $rl->id);
228 228
     }
229 229
 
Please login to merge, or discard this patch.
edit.php 2 patches
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -55,7 +55,7 @@
 block discarded – undo
55 55
     $res = relationship_delete_relationship($relationship);
56 56
     if($res === -1) {
57 57
         print_string('has_cohorts', 'local_relationship');
58
-   }
58
+    }
59 59
     redirect($returnurl);
60 60
 }
61 61
 
Please login to merge, or discard this patch.
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -21,10 +21,10 @@  discard block
 block discarded – undo
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->libdir.'/filelib.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->libdir . '/filelib.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
 
@@ -53,7 +53,7 @@  discard block
 block discarded – undo
53 53
 
54 54
 if (optional_param('confirmdelete', 0, PARAM_BOOL) && confirm_sesskey() && $relationship->id) {
55 55
     $res = relationship_delete_relationship($relationship);
56
-    if($res === -1) {
56
+    if ($res === -1) {
57 57
         print_string('has_cohorts', 'local_relationship');
58 58
    }
59 59
     redirect($returnurl);
Please login to merge, or discard this patch.
lib.php 2 patches
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -284,7 +284,7 @@
 block discarded – undo
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;
Please login to merge, or discard this patch.
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -217,7 +217,7 @@  discard block
 block discarded – undo
217 217
     global $DB;
218 218
 
219 219
     $relationship = $DB->get_record('relationship', array('id' => $relationshipid), '*', MUST_EXIST);
220
-    $relationship->tags = core_tag_tag::get_item_tags_array('relationship', 'relationship', $relationshipid  );
220
+    $relationship->tags = core_tag_tag::get_item_tags_array('relationship', 'relationship', $relationshipid);
221 221
 
222 222
     return $relationship;
223 223
 }
@@ -320,7 +320,7 @@  discard block
 block discarded – undo
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) {
Please login to merge, or discard this patch.
cohorts.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -21,9 +21,9 @@  discard block
 block discarded – undo
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
 block discarded – undo
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(
Please login to merge, or discard this patch.
edit_group.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -21,10 +21,10 @@
 block discarded – undo
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
 
Please login to merge, or discard this patch.
classes/existing_selector.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -44,7 +44,7 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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();
Please login to merge, or discard this patch.
classes/observer.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -23,7 +23,7 @@
 block discarded – undo
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.
Please login to merge, or discard this patch.
classes/form/edit_group.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -24,7 +24,7 @@
 block discarded – undo
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_group extends \moodleform {
30 30
 
Please login to merge, or discard this patch.
classes/form/autogroup.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -24,7 +24,7 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
 
Please login to merge, or discard this patch.