Completed
Push — master ( 5da9ea...eef579 )
by Angel Fernando Quiroz
50:18 queued 17:36
created
src/Chamilo/TicketBundle/Entity/Message.php 1 patch
Indentation   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -53,12 +53,12 @@
 block discarded – undo
53 53
      */
54 54
     protected $ipAddress;
55 55
 
56
-     /**
57
-     * @var Ticket
58
-     *
59
-     * @ORM\ManyToOne(targetEntity="Chamilo\TicketBundle\Entity\Ticket")
60
-     * @ORM\JoinColumn(name="ticket_id", referencedColumnName="id")
61
-     **/
56
+        /**
57
+         * @var Ticket
58
+         *
59
+         * @ORM\ManyToOne(targetEntity="Chamilo\TicketBundle\Entity\Ticket")
60
+         * @ORM\JoinColumn(name="ticket_id", referencedColumnName="id")
61
+         **/
62 62
     protected $ticket;
63 63
 
64 64
     /**
Please login to merge, or discard this patch.
main/ticket/tutor_report.lib.php 3 patches
Doc Comments   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -73,7 +73,7 @@  discard block
 block discarded – undo
73 73
 
74 74
 /**
75 75
  * @param $courseInfo
76
- * @param $weeksCount
76
+ * @param string $weeksCount
77 77
  * @param $page
78 78
  * @return array
79 79
  */
@@ -182,7 +182,7 @@  discard block
 block discarded – undo
182 182
 
183 183
 /**
184 184
  * @param $datos
185
- * @param $pagina
185
+ * @param integer $pagina
186 186
  * @return string
187 187
  */
188 188
 function showStudentResult($datos, $pagina)
@@ -201,8 +201,8 @@  discard block
 block discarded – undo
201 201
 
202 202
 /**
203 203
  * @param $data
204
- * @param $numero_semanas
205
- * @return array
204
+ * @param integer $numero_semanas
205
+ * @return string[]
206 206
  */
207 207
 function showStudentResultExport($data, $numero_semanas)
208 208
 {
Please login to merge, or discard this patch.
Upper-Lower-Casing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -59,11 +59,11 @@
 block discarded – undo
59 59
     } else {
60 60
         $page = (!isset($_GET['page'])) ? 1 : $_GET['page'];
61 61
 
62
-        Database::query("UPDATE $table_students_report sr SET sr.work_ok = 1
62
+        Database::query("update $table_students_report sr SET sr.work_ok = 1
63 63
 		WHERE CONCAT (sr.user_id,',',sr.week_report_id)
64 64
 		IN (SELECT DISTINCT CONCAT(w.user_id,',',rs.id)
65 65
 		FROM $table_work w  JOIN $table_reporte_semanas rs ON w.parent_id = rs.work_id)");
66
-        Database::query("UPDATE $table_students_report sr SET sr.thread_ok = 1
66
+        Database::query("update $table_students_report sr SET sr.thread_ok = 1
67 67
 		WHERE CONCAT (sr.user_id,',',sr.week_report_id)
68 68
 		IN (SELECT DISTINCT CONCAT(f.poster_id,',',rs.id)
69 69
 		FROM $table_post f  JOIN $table_reporte_semanas rs ON f.thread_id = rs.forum_id)");
Please login to merge, or discard this patch.
Spacing   +20 added lines, -20 removed lines patch added patch discarded remove patch
@@ -106,51 +106,51 @@  discard block
 block discarded – undo
106 106
     $lineHeaderExport = array(null, null);
107 107
     $lineHeaderExport2 = array(null, ull);
108 108
     while ($rowe = Database::fetch_assoc($resultHeader)) {
109
-        $lineHeaderExport[] = utf8_decode('Work' . $rowe['week_id']);
110
-        $lineHeaderExport[] = utf8_decode('Forum' . $rowe['week_id']);
109
+        $lineHeaderExport[] = utf8_decode('Work'.$rowe['week_id']);
110
+        $lineHeaderExport[] = utf8_decode('Forum'.$rowe['week_id']);
111 111
         //$fila_export_encabezado[] =  utf8_decode('Eval'.$rowe['week_id']);
112 112
         //$fila_export_encabezado[] =  utf8_decode('PC'.$rowe['week_id']);
113 113
         $lineHeaderExport2[] = utf8_decode($rowe['work_title']);
114 114
         $lineHeaderExport2[] = utf8_decode($rowe['thread_title']);
115 115
         //$fila_export_encabezado2[] = utf8_decode($rowe['eval_title']);
116 116
         //$fila_export_encabezado2[] = utf8_decode($rowe['pc_title']);
117
-        $fila_export = array('Work' . $rowe['week_id'], 'Forum' . $rowe['week_id'], 'Eval' . $rowe['week_id'], 'PC' . $rowe['week_id']);
117
+        $fila_export = array('Work'.$rowe['week_id'], 'Forum'.$rowe['week_id'], 'Eval'.$rowe['week_id'], 'PC'.$rowe['week_id']);
118 118
         if ($rowe['week_id'] > (($page - 1) * 7) && $rowe['week_id'] <= (7 * $page)) {
119 119
             $ids[$rowe['week_id']] = $rowe['id'];
120
-            $line.='<th>
121
-                <a href="#" onClick="showContent(' . "'tarea" . $rowe['week_id'] . "'" . ');">Work' . $rowe['week_id'] . '
122
-                        <div class="blackboard_hide" id="tarea' . $rowe['week_id'] . '">' . $rowe['work_title'] . '</div>
120
+            $line .= '<th>
121
+                <a href="#" onClick="showContent(' . "'tarea".$rowe['week_id']."'".');">Work'.$rowe['week_id'].'
122
+                        <div class="blackboard_hide" id="tarea' . $rowe['week_id'].'">'.$rowe['work_title'].'</div>
123 123
                 </a></th>';
124
-            $line.= '<th>
125
-                <a href="#" onClick="showContent(' . "'foro" . $rowe['week_id'] . "'" . ');">Forum' . $rowe['week_id'] . '
126
-                        <div class="blackboard_hide" id="foro' . $rowe['week_id'] . '">' . $rowe['thread_title'] . '</div>
124
+            $line .= '<th>
125
+                <a href="#" onClick="showContent(' . "'foro".$rowe['week_id']."'".');">Forum'.$rowe['week_id'].'
126
+                        <div class="blackboard_hide" id="foro' . $rowe['week_id'].'">'.$rowe['thread_title'].'</div>
127 127
                 </a>
128 128
                 </th>';
129 129
         }
130 130
     }
131 131
     $tableExport[] = $lineHeaderExport;
132 132
     $tableExport[] = $lineHeaderExport2;
133
-    $line.= '</tr>';
133
+    $line .= '</tr>';
134 134
 
135 135
     $html = '<form action="tutor.php" name="semanas" id="semanas" method="POST">
136 136
             <div class="row">
137
-            ' . get_lang('SelectWeeksSpan') . '
137
+            ' . get_lang('SelectWeeksSpan').'
138 138
             <select name="weeksNumber" id="weeksNumber" onChange="submit();">
139
-            <option value="7" ' . (($weeksCount == 7) ? 'selected="selected"' : "") . '>7 weeks</option>
140
-            <option value="14" ' . (($weeksCount == 14) ? 'selected="selected"' : "") . '>14 weeks</option>
139
+            <option value="7" ' . (($weeksCount == 7) ? 'selected="selected"' : "").'>7 weeks</option>
140
+            <option value="14" ' . (($weeksCount == 14) ? 'selected="selected"' : "").'>14 weeks</option>
141 141
             </select>';
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;
@@ -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
 
200 200
     return $fila;
201 201
 }
Please login to merge, or discard this patch.
main/ticket/assign_tickets.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -10,7 +10,7 @@
 block discarded – undo
10 10
 
11 11
 api_protect_course_script();
12 12
 if (!api_is_allowed_to_edit()) {
13
-	api_not_allowed();
13
+    api_not_allowed();
14 14
 }
15 15
 $course_info = api_get_course_info();
16 16
 $course_code = $course_info['code'];
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
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -36,7 +36,7 @@
 block discarded – undo
36 36
     /**
37 37
      * Instance the plugin
38 38
      * @staticvar null $result
39
-     * @return Tour
39
+     * @return AzureActiveDirectory
40 40
      */
41 41
     static function create()
42 42
     {
Please login to merge, or discard this patch.
main/admin/legal_list.php 1 patch
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -42,10 +42,10 @@
 block discarded – undo
42 42
 // this 2 "mask" function are here just because the SortableTable
43 43
 function get_legal_data_mask($id, $params = null, $row = null)
44 44
 {
45
-	return LegalManager::get_legal_data($id, $params, $row);
45
+    return LegalManager::get_legal_data($id, $params, $row);
46 46
 }
47 47
 function count_mask()
48 48
 {
49
-	return LegalManager::count();
49
+    return LegalManager::count();
50 50
 }
51 51
 Display :: display_footer();
Please login to merge, or discard this patch.
src/Chamilo/CourseBundle/Component/CourseCopy/CourseRecycler.php 2 patches
Indentation   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -619,8 +619,8 @@  discard block
 block discarded – undo
619 619
     }
620 620
 
621 621
     /**
622
-    * Recycle Thematics
623
-    */
622
+     * Recycle Thematics
623
+     */
624 624
     public function recycle_thematic($session_id = 0)
625 625
     {
626 626
         if ($this->course->has_resources(RESOURCE_THEMATIC)) {
@@ -685,8 +685,8 @@  discard block
 block discarded – undo
685 685
     }
686 686
 
687 687
     /**
688
-    * Recycle Attendances
689
-    */
688
+     * Recycle Attendances
689
+     */
690 690
     public function recycle_attendance($session_id = 0)
691 691
     {
692 692
         if ($this->course->has_resources(RESOURCE_ATTENDANCE)) {
Please login to merge, or discard this patch.
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -37,7 +37,7 @@
 block discarded – undo
37 37
      * course
38 38
      * @param string $backupType 'full_backup' or 'select_items'
39 39
      *
40
-     * @return bool
40
+     * @return false|null
41 41
      *
42 42
      * @assert (null) === false
43 43
      */
Please login to merge, or discard this patch.
src/Chamilo/CourseBundle/Component/CourseCopy/Resources/Thematic.php 1 patch
Indentation   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -11,13 +11,13 @@
 block discarded – undo
11 11
 {
12 12
     public $params = array();
13 13
     public $thematic_advance_list = array();
14
-	public $thematic_plan_list = array();
14
+    public $thematic_plan_list = array();
15 15
 
16 16
     /**
17
-    * Create a new Thematic
18
-    *
19
-    * @param array $params
20
-    */
17
+     * Create a new Thematic
18
+     *
19
+     * @param array $params
20
+     */
21 21
     public function __construct($params)
22 22
     {
23 23
         parent::__construct($params['id'], RESOURCE_THEMATIC);
Please login to merge, or discard this patch.
main/inc/lib/formvalidator/Rule/HTML.php 3 patches
Doc Comments   -2 removed lines patch added patch discarded remove patch
@@ -25,8 +25,6 @@
 block discarded – undo
25 25
      * Get allowed tags
26 26
      * @param int $mode NO_HTML, STUDENT_HTML, TEACHER_HTML,
27 27
      * STUDENT_HTML_FULLPAGE or TEACHER_HTML_FULLPAGE
28
-     * @param boolean $fullpage If true, the allowed tags for full-page editing
29
-     * are returned.
30 28
      */
31 29
     static function get_allowed_tags($mode)
32 30
     {
Please login to merge, or discard this patch.
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -16,7 +16,7 @@  discard block
 block discarded – undo
16 16
      */
17 17
     function validate($html, $mode = NO_HTML)
18 18
     {
19
-        $allowed_tags = self::get_allowed_tags ($mode, $fullpage);
19
+        $allowed_tags = self::get_allowed_tags($mode, $fullpage);
20 20
         $cleaned_html = kses($html, $allowed_tags);
21 21
         return $html == $cleaned_html;
22 22
     }
@@ -33,7 +33,7 @@  discard block
 block discarded – undo
33 33
         // Include the allowed tags.
34 34
         //include __DIR__.'/allowed_tags.inc.php';
35 35
         global $allowed_tags_student, $allowed_tags_student_full_page, $allowed_tags_teacher, $allowed_tags_teacher_full_page;
36
-        switch($mode)
36
+        switch ($mode)
37 37
         {
38 38
             case NO_HTML:
39 39
                 return array();
Please login to merge, or discard this patch.
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -33,8 +33,7 @@
 block discarded – undo
33 33
         // Include the allowed tags.
34 34
         //include __DIR__.'/allowed_tags.inc.php';
35 35
         global $allowed_tags_student, $allowed_tags_student_full_page, $allowed_tags_teacher, $allowed_tags_teacher_full_page;
36
-        switch($mode)
37
-        {
36
+        switch($mode) {
38 37
             case NO_HTML:
39 38
                 return array();
40 39
                 break;
Please login to merge, or discard this patch.