Completed
Push — 1.11.x ( ca7787...41c0f2 )
by José
31:51
created
plugin/courseblock/install.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,7 +1,7 @@
 block discarded – undo
1 1
 <?php
2 2
 /* For license terms, see /license.txt */
3 3
 
4
-require_once dirname(__FILE__) . '/config.php';
4
+require_once dirname(__FILE__).'/config.php';
5 5
 
6 6
 if (!api_is_platform_admin()) {
7 7
     die ('You must have admin permissions to install plugins');
Please login to merge, or discard this patch.
main/inc/lib/surveymanager.lib.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -47,20 +47,20 @@  discard block
 block discarded – undo
47 47
         $res = Database::query($sql);
48 48
         $refs = array();
49 49
         $list = array();
50
-        $plain_array=array();
50
+        $plain_array = array();
51 51
 
52 52
         while ($survey = Database::fetch_array($res, 'ASSOC')) {
53
-            $plain_array[$survey['survey_id']]=$survey;
54
-            $surveys_parents[]=$survey['survey_version'];
55
-            $thisref = &$refs[ $survey['survey_id'] ];
53
+            $plain_array[$survey['survey_id']] = $survey;
54
+            $surveys_parents[] = $survey['survey_version'];
55
+            $thisref = &$refs[$survey['survey_id']];
56 56
             $thisref['parent_id'] = $survey['parent_id'];
57 57
             $thisref['name'] = $survey['name'];
58 58
             $thisref['id'] = $survey['survey_id'];
59 59
             $thisref['survey_version'] = $survey['survey_version'];
60 60
             if ($survey['parent_id'] == 0) {
61
-                $list[ $survey['survey_id'] ] = &$thisref;
61
+                $list[$survey['survey_id']] = &$thisref;
62 62
             } else {
63
-                $refs[ $survey['parent_id'] ]['children'][ $survey['survey_id'] ] = &$thisref;
63
+                $refs[$survey['parent_id']]['children'][$survey['survey_id']] = &$thisref;
64 64
             }
65 65
         }
66 66
         $this->surveylist = $list;
@@ -79,7 +79,7 @@  discard block
 block discarded – undo
79 79
     public function getParentId($id)
80 80
     {
81 81
         $node = $this->plainsurveylist[$id];
82
-        if (is_array($node)&& !empty($node['parent_id'])) {
82
+        if (is_array($node) && !empty($node['parent_id'])) {
83 83
             return $node['parent_id'];
84 84
         } else {
85 85
             return -1;
@@ -99,12 +99,12 @@  discard block
 block discarded – undo
99 99
         if (is_array($list)) {
100 100
             foreach ($list as $key => $node) {
101 101
                 if (isset($node['children']) && is_array($node['children'])) {
102
-                    $result[$key]= $node['name'];
102
+                    $result[$key] = $node['name'];
103 103
                     $re = self::createList($node['children']);
104 104
                     if (!empty($re)) {
105 105
                         if (is_array($re)) {
106 106
                             foreach ($re as $key => $r) {
107
-                                $result[$key] = '' . $r;
107
+                                $result[$key] = ''.$r;
108 108
                             }
109 109
                         } else {
110 110
                             $result[] = $re;
Please login to merge, or discard this patch.
main/survey/preview.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -154,7 +154,7 @@  discard block
 block discarded – undo
154 154
 						survey_question_option.c_id = $course_id
155 155
 					WHERE
156 156
 					    survey_question.survey_id = '".intval($survey_id)."' AND
157
-						survey_question.question_id IN (".Database::escape_string(implode(',',$paged_questions[$_GET['show']]), null, false).") AND
157
+						survey_question.question_id IN (".Database::escape_string(implode(',', $paged_questions[$_GET['show']]), null, false).") AND
158 158
 						survey_question.c_id =  $course_id
159 159
 					ORDER BY survey_question.sort, survey_question_option.sort ASC";
160 160
 
@@ -191,7 +191,7 @@  discard block
 block discarded – undo
191 191
 
192 192
 	// Displaying the form with the questions
193 193
 	if (isset($_GET['show'])) {
194
-		$show = (int)$_GET['show'] + 1;
194
+		$show = (int) $_GET['show'] + 1;
195 195
 	} else {
196 196
 		$show = 0;
197 197
 	}
Please login to merge, or discard this patch.
main/ticket/tutor_report.lib.php 1 patch
Spacing   +22 added lines, -22 removed lines patch added patch discarded remove patch
@@ -21,7 +21,7 @@  discard block
 block discarded – undo
21 21
     $table_post = Database::get_course_table(TABLE_FORUM_POST);
22 22
     $table_work = Database::get_course_table(TABLE_STUDENT_PUBLICATION);
23 23
     $course_code = Database::escape_string($course_code);
24
-    $res = Database::query("SELECT COUNT(*) as cant FROM $table_reporte_semanas WHERE course_code = '" . $course_code . "'");
24
+    $res = Database::query("SELECT COUNT(*) as cant FROM $table_reporte_semanas WHERE course_code = '".$course_code."'");
25 25
     $sqlWeeks = "SELECT semanas FROM $table_semanas_curso WHERE course_code = '$course_code'";
26 26
     $resWeeks = Database::query($sqlWeeks);
27 27
     $weeks = Database::fetch_object($resWeeks);
@@ -105,52 +105,52 @@  discard block
 block discarded – undo
105 105
     $lineHeaderExport = array(null, null);
106 106
     $lineHeaderExport2 = array(null, ull);
107 107
     while ($rowe = Database::fetch_assoc($resultHeader)) {
108
-        $lineHeaderExport[] = utf8_decode('Work' . $rowe['week_id']);
109
-        $lineHeaderExport[] = utf8_decode('Forum' . $rowe['week_id']);
108
+        $lineHeaderExport[] = utf8_decode('Work'.$rowe['week_id']);
109
+        $lineHeaderExport[] = utf8_decode('Forum'.$rowe['week_id']);
110 110
         //$fila_export_encabezado[] =  utf8_decode('Eval'.$rowe['week_id']);
111 111
         //$fila_export_encabezado[] =  utf8_decode('PC'.$rowe['week_id']);
112 112
         $lineHeaderExport2[] = utf8_decode($rowe['work_title']);
113 113
         $lineHeaderExport2[] = utf8_decode($rowe['thread_title']);
114 114
         //$fila_export_encabezado2[] = utf8_decode($rowe['eval_title']);
115 115
         //$fila_export_encabezado2[] = utf8_decode($rowe['pc_title']);
116
-        $fila_export = array('Work' . $rowe['week_id'], 'Forum' . $rowe['week_id'], 'Eval' . $rowe['week_id'], 'PC' . $rowe['week_id']);
116
+        $fila_export = array('Work'.$rowe['week_id'], 'Forum'.$rowe['week_id'], 'Eval'.$rowe['week_id'], 'PC'.$rowe['week_id']);
117 117
         if ($rowe['week_id'] > (($page - 1) * 7) && $rowe['week_id'] <= (7 * $page)) {
118 118
             $ids[$rowe['week_id']] = $rowe['id'];
119
-            $line.='<th>
120
-                <a href="#" onClick="showContent(' . "'tarea" . $rowe['week_id'] . "'" . ');">Work' . $rowe['week_id'] . '
121
-                        <div class="blackboard_hide" id="tarea' . $rowe['week_id'] . '">' . $rowe['work_title'] . '</div>
119
+            $line .= '<th>
120
+                <a href="#" onClick="showContent(' . "'tarea".$rowe['week_id']."'".');">Work'.$rowe['week_id'].'
121
+                        <div class="blackboard_hide" id="tarea' . $rowe['week_id'].'">'.$rowe['work_title'].'</div>
122 122
                 </a></th>';
123
-            $line.= '<th>
124
-                <a href="#" onClick="showContent(' . "'foro" . $rowe['week_id'] . "'" . ');">Forum' . $rowe['week_id'] . '
125
-                        <div class="blackboard_hide" id="foro' . $rowe['week_id'] . '">' . $rowe['thread_title'] . '</div>
123
+            $line .= '<th>
124
+                <a href="#" onClick="showContent(' . "'foro".$rowe['week_id']."'".');">Forum'.$rowe['week_id'].'
125
+                        <div class="blackboard_hide" id="foro' . $rowe['week_id'].'">'.$rowe['thread_title'].'</div>
126 126
                 </a>
127 127
                 </th>';
128 128
         }
129 129
     }
130 130
     $tableExport[] = $lineHeaderExport;
131 131
     $tableExport[] = $lineHeaderExport2;
132
-    $line.= '</tr>';
132
+    $line .= '</tr>';
133 133
 
134 134
     $html = '<form action="tutor.php" name="semanas" id="semanas" method="POST">
135 135
             <div class="row">
136
-            ' . get_lang('SelectWeeksSpan') . '
136
+            ' . get_lang('SelectWeeksSpan').'
137 137
             <select name="weeksNumber" id="weeksNumber" onChange="submit();">
138
-            <option value="7" ' . (($weeksCount == 7) ? 'selected="selected"' : "") . '>7 weeks</option>
139
-            <option value="14" ' . (($weeksCount == 14) ? 'selected="selected"' : "") . '>14 weeks</option>
138
+            <option value="7" ' . (($weeksCount == 7) ? 'selected="selected"' : "").'>7 weeks</option>
139
+            <option value="14" ' . (($weeksCount == 14) ? 'selected="selected"' : "").'>14 weeks</option>
140 140
             </select>';
141 141
 
142 142
 
143 143
     if ($weeksCount == 14) {
144
-        $html .= '<span style="float:right;"><a href="tutor.php?page=' . (($page == 1) ? 2 : 1) . '">' . (($page == 1) ? "Siguiente" : "Anterior") . '</a></span>';
144
+        $html .= '<span style="float:right;"><a href="tutor.php?page='.(($page == 1) ? 2 : 1).'">'.(($page == 1) ? "Siguiente" : "Anterior").'</a></span>';
145 145
     }
146
-    $html .= '<span style="float:right;"><a href="' . api_get_self() . '?action=export' . $get_parameter . $get_parameter2 . '">' . Display::return_icon('export_excel.png', get_lang('Export'), '', '32') . '</a></span>';
146
+    $html .= '<span style="float:right;"><a href="'.api_get_self().'?action=export'.$get_parameter.$get_parameter2.'">'.Display::return_icon('export_excel.png', get_lang('Export'), '', '32').'</a></span>';
147 147
 
148 148
     $html .= '</form>';
149 149
     $html .= '<table class="reports">';
150 150
     $html .= '<tr>
151 151
             <th ></th>';
152 152
     for ($i = (7 * $page - 6); $i <= $page * 7; $i++) {
153
-        $html .= '<th colspan="2">Week ' . $i . '<a href="assign_tickets.php?id=' . $ids[$i] . '" class="ajax">' . Display::return_icon('edit.png', get_lang('Edit'), array('width' => '16', 'height' => '16'), 22) . '</a></th>';
153
+        $html .= '<th colspan="2">Week '.$i.'<a href="assign_tickets.php?id='.$ids[$i].'" class="ajax">'.Display::return_icon('edit.png', get_lang('Edit'), array('width' => '16', 'height' => '16'), 22).'</a></th>';
154 154
     }
155 155
     $html .= '</tr>';
156 156
     $html .= $line;
@@ -167,7 +167,7 @@  discard block
 block discarded – undo
167 167
         if ($row['week_id'] > (($page - 1) * 7) && $row['week_id'] <= (7 * $page)) {
168 168
             $results[$row['username']][$row['week_id']] = $row;
169 169
             if (count($results[$row['username']]) == 7) {
170
-                $html.= showStudentResult($results[$row['username']], $page);
170
+                $html .= showStudentResult($results[$row['username']], $page);
171 171
             }
172 172
         }
173 173
         if (count($resultadose[$row['username']]) == $weeksCount) {
@@ -190,12 +190,12 @@  discard block
 block discarded – undo
190 190
     $inicio = (7 * $pagina - 6);
191 191
     $fila = '<tr>';
192 192
 
193
-    $fila.= '<td><a href="' . api_get_path(WEB_CODE_PATH) . 'user/userInfo.php?' . api_get_cidreq() . '&uInfo=' . $datos[$inicio]['user_id'] . '">' . $datos[$inicio]['username'] . '</a></td>';
193
+    $fila .= '<td><a href="'.api_get_path(WEB_CODE_PATH).'user/userInfo.php?'.api_get_cidreq().'&uInfo='.$datos[$inicio]['user_id'].'">'.$datos[$inicio]['username'].'</a></td>';
194 194
     foreach ($datos as $dato) {
195
-        $fila.= '<td align="center">' . (($dato['work_ok'] == 1) ? Display::return_icon('check.png') : Display::return_icon('aspa.png')) . '</td>';
196
-        $fila.= '<td align="center">' . (($dato['thread_ok'] == 1) ? Display::return_icon('check.png') : Display::return_icon('aspa.png')) . '</td>';
195
+        $fila .= '<td align="center">'.(($dato['work_ok'] == 1) ? Display::return_icon('check.png') : Display::return_icon('aspa.png')).'</td>';
196
+        $fila .= '<td align="center">'.(($dato['thread_ok'] == 1) ? Display::return_icon('check.png') : Display::return_icon('aspa.png')).'</td>';
197 197
     }
198
-    $fila.= '</tr>';
198
+    $fila .= '</tr>';
199 199
     return $fila;
200 200
 }
201 201
 
Please login to merge, or discard this patch.
main/ticket/assign_tickets.php 1 patch
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -20,7 +20,7 @@  discard block
 block discarded – undo
20 20
 echo '<div id="confirmation"></div>';
21 21
 $id = intval($_GET['id']);
22 22
 $tblWeeklyReport = Database::get_main_table('rp_reporte_semanas');
23
-$sql ="SELECT * FROM $tblWeeklyReport WHERE id = '$id'";
23
+$sql = "SELECT * FROM $tblWeeklyReport WHERE id = '$id'";
24 24
 $sql_tasks = "SELECT id AS colid, title as coltitle
25 25
     FROM ".Database::get_course_table(TABLE_STUDENT_PUBLICATION)."
26 26
     WHERE parent_id = 0
@@ -45,28 +45,28 @@  discard block
 block discarded – undo
45 45
 $result_forum = Database::query($sql_forum);
46 46
 
47 47
 echo '<div class="row">
48
-        <input type="hidden" id="rs_id" name ="rs_id" value="' . $id . '">
49
-        <div class="formw">' . get_lang('PleaseSelectTasks') . '</div>
48
+        <input type="hidden" id="rs_id" name ="rs_id" value="' . $id.'">
49
+        <div class="formw">' . get_lang('PleaseSelectTasks').'</div>
50 50
     </div>';
51 51
 echo '<div class="row"><div class="formw"><select name ="work_id" id="work_id">';
52
-echo '<option value="0"' . (($row['colid'] == $rs->work_id) ? "selected" : "") . '>' . get_lang('PleaseSelect') . '</option>';
52
+echo '<option value="0"'.(($row['colid'] == $rs->work_id) ? "selected" : "").'>'.get_lang('PleaseSelect').'</option>';
53 53
 while ($row = Database::fetch_assoc($result_tasks)) {
54
-    echo '<option value="' . $row['colid'] . '"' . (($row['colid'] == $rs->work_id) ? "selected" : "") . '>' . $row['coltitle'] . '</option>';
54
+    echo '<option value="'.$row['colid'].'"'.(($row['colid'] == $rs->work_id) ? "selected" : "").'>'.$row['coltitle'].'</option>';
55 55
 }
56 56
 echo '</select></div><div>';
57 57
 echo '<div class="row">
58
-        <div class="formw">' . get_lang('PleaseSelectThread') . '</div>
58
+        <div class="formw">' . get_lang('PleaseSelectThread').'</div>
59 59
     </div>';
60 60
 echo '<div class="row"><div class="formw"><select name ="forum_id" id="forum_id">';
61
-echo '<option value="0"' . (($row['colid'] == $rs->work_id) ? "forum_id" : "") . '>' . get_lang('PleaseSelect') . '</option>';
61
+echo '<option value="0"'.(($row['colid'] == $rs->work_id) ? "forum_id" : "").'>'.get_lang('PleaseSelect').'</option>';
62 62
 while ($row = Database::fetch_assoc($result_forum)) {
63
-    echo '<option value="' . $row['colid'] . '"' . (($row['colid'] == $rs->forum_id) ? "selected" : "") . '>' . $row['coltitle'] . '</option>';
63
+    echo '<option value="'.$row['colid'].'"'.(($row['colid'] == $rs->forum_id) ? "selected" : "").'>'.$row['coltitle'].'</option>';
64 64
 }
65 65
 echo '</select></div><div>';
66 66
 echo '<div class="row">
67 67
         <div class="formw">
68
-        <button class="save" name="edit" type="button" value="' . get_lang('Edit') . '" onClick="save(' . "$id" . ');">' .
69
-            get_lang('Edit') . '</button>
68
+        <button class="save" name="edit" type="button" value="' . get_lang('Edit').'" onClick="save('."$id".');">'.
69
+            get_lang('Edit').'</button>
70 70
         </div>
71 71
     </div>';
72 72
 echo '</form>';
Please login to merge, or discard this patch.
main/ticket/tutor.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -17,7 +17,7 @@  discard block
 block discarded – undo
17 17
         var url     = this.href;
18 18
         var dialog  = $("#dialog");
19 19
         if ($("#dialog").length == 0) {
20
-                dialog  = $("' . '<div id="dialog" style="display:hidden"></div>' . '").appendTo("body");
20
+                dialog  = $("' . '<div id="dialog" style="display:hidden"></div>'.'").appendTo("body");
21 21
         }
22 22
 
23 23
         // load remote content
@@ -56,7 +56,7 @@  discard block
 block discarded – undo
56 56
 	 $.ajax({
57 57
 		contentType: "application/x-www-form-urlencoded",
58 58
 		beforeSend: function(objeto) {
59
-		$("div#confirmation").html("<img src=\"' . api_get_path(WEB_LIBRARY_PATH) . 'javascript/indicator.gif\" />"); },
59
+		$("div#confirmation").html("<img src=\"' . api_get_path(WEB_LIBRARY_PATH).'javascript/indicator.gif\" />"); },
60 60
 		type: "POST",
61 61
 		url: "update_report.php",
62 62
 		data: "work_id="+work_id+"&forum_id="+forum_id+"&rs_id="+rs_id,
@@ -95,7 +95,7 @@  discard block
 block discarded – undo
95 95
 $course_code = api_get_course_id();
96 96
 $results = initializeReport($course_code);
97 97
 if (isset($_GET['action'])) {
98
-    Export::arrayToXls($results['export'], "COURSE_USER_REPORT" . $course_code);
98
+    Export::arrayToXls($results['export'], "COURSE_USER_REPORT".$course_code);
99 99
 } else {
100 100
     Display::display_header();
101 101
     api_protect_course_script();
Please login to merge, or discard this patch.
main/ticket/download.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -42,8 +42,8 @@
 block discarded – undo
42 42
 $file_url = Database::escape_string($file_url);
43 43
 $title = $_GET['title'];
44 44
 $path_attachment = api_get_path(SYS_ARCHIVE_PATH);
45
-$path_message_attach = $path_attachment . 'plugin_ticket_messageattch/';
46
-$full_file_name = $path_message_attach . $file_url;
45
+$path_message_attach = $path_attachment.'plugin_ticket_messageattch/';
46
+$full_file_name = $path_message_attach.$file_url;
47 47
 if (Security::check_abs_path($full_file_name, $path_message_attach)) {
48 48
     DocumentManager::file_send_for_download($full_file_name, true, $title);
49 49
 }
Please login to merge, or discard this patch.
main/ticket/course_user_list.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -38,8 +38,8 @@
 block discarded – undo
38 38
 $courseSelect = Display::select('course_id', $arrCourseList, 0, array(), false);
39 39
 $courseControl = Display::div($courseSelect, array('class' => 'controls'));
40 40
 
41
-$userDiv = Display::div($userLabel . " " . $userControl, array('class' => 'control-group'));
42
-$courseDiv = Display::div($courseLabel . " " . $courseControl, array('class' => 'control-group'));
41
+$userDiv = Display::div($userLabel." ".$userControl, array('class' => 'control-group'));
42
+$courseDiv = Display::div($courseLabel." ".$courseControl, array('class' => 'control-group'));
43 43
 echo $userDiv;
44 44
 echo $courseDiv;
45 45
 
Please login to merge, or discard this patch.
plugin/azure_active_directory/src/AzureActiveDirectory.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -63,13 +63,13 @@  discard block
 block discarded – undo
63 63
         $settings = [];
64 64
 
65 65
         foreach ($settingsInfo as $settingInfo) {
66
-            $variable = str_replace($this->get_name() . '_', '', $settingInfo['variable']);
66
+            $variable = str_replace($this->get_name().'_', '', $settingInfo['variable']);
67 67
 
68 68
             $settings[$variable] = $settingInfo['selected_value'];
69 69
         }
70 70
 
71 71
         $url = "https://login.microsoftonline.com/{$settings[self::SETTING_TENANT]}/oauth2/v2.0/";
72
-        $callback = api_get_path(WEB_PLUGIN_PATH) . $this->get_name() . '/src/callback.php';
72
+        $callback = api_get_path(WEB_PLUGIN_PATH).$this->get_name().'/src/callback.php';
73 73
 
74 74
         if ($urlType === self::URL_TYPE_SIGNOUT) {
75 75
             $action = 'logout';
@@ -97,6 +97,6 @@  discard block
 block discarded – undo
97 97
             ];
98 98
         }
99 99
 
100
-        return $url . $action . '?' . http_build_query($urlParams);
100
+        return $url.$action.'?'.http_build_query($urlParams);
101 101
     }
102 102
 }
103 103
\ No newline at end of file
Please login to merge, or discard this patch.