Completed
Pull Request — 1.11.x (#1599)
by José
28:19
created
main/dashboard/index.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -20,12 +20,12 @@
 block discarded – undo
20 20
 
21 21
 // current section
22 22
 $this_section = SECTION_DASHBOARD;
23
-unset($_SESSION['this_section']);//for hmtl editor repository
23
+unset($_SESSION['this_section']); //for hmtl editor repository
24 24
 
25 25
 // get actions
26 26
 $actions = array('listing', 'store_user_block', 'disable_block');
27 27
 $action = 'listing';
28
-if (isset($_GET['action']) && in_array($_GET['action'],$actions)) {
28
+if (isset($_GET['action']) && in_array($_GET['action'], $actions)) {
29 29
 	$action = $_GET['action'];
30 30
 }
31 31
 
Please login to merge, or discard this patch.
main/timeline/index.php 1 patch
Spacing   +15 added lines, -15 removed lines patch added patch discarded remove patch
@@ -23,19 +23,19 @@  discard block
 block discarded – undo
23 23
 
24 24
 switch ($action) {
25 25
     case 'add':
26
-        $interbreadcrumb[]=array('url' => 'index.php','name' => get_lang('Timeline'));
27
-        $interbreadcrumb[]=array('url' => '#','name' => get_lang('Add'));
26
+        $interbreadcrumb[] = array('url' => 'index.php', 'name' => get_lang('Timeline'));
27
+        $interbreadcrumb[] = array('url' => '#', 'name' => get_lang('Add'));
28 28
         break;
29 29
     case 'edit':
30
-        $interbreadcrumb[]=array('url' => 'index.php','name' => get_lang('Timeline'));
31
-        $interbreadcrumb[]=array('url' => '#','name' => get_lang('Edit'));
30
+        $interbreadcrumb[] = array('url' => 'index.php', 'name' => get_lang('Timeline'));
31
+        $interbreadcrumb[] = array('url' => '#', 'name' => get_lang('Edit'));
32 32
         break;
33 33
     case 'add_item':
34
-        $interbreadcrumb[]=array('url' => 'index.php','name' => get_lang('Timeline'));
35
-        $interbreadcrumb[]=array('url' => '#','name' => get_lang('TimelineItem'));
34
+        $interbreadcrumb[] = array('url' => 'index.php', 'name' => get_lang('Timeline'));
35
+        $interbreadcrumb[] = array('url' => '#', 'name' => get_lang('TimelineItem'));
36 36
         break;
37 37
     default:
38
-        $interbreadcrumb[]=array('url' => '#','name' => get_lang('Timeline'));
38
+        $interbreadcrumb[] = array('url' => '#', 'name' => get_lang('Timeline'));
39 39
 }
40 40
 
41 41
 //jqgrid will use this URL to do the selects
@@ -46,8 +46,8 @@  discard block
 block discarded – undo
46 46
 
47 47
 //Column config
48 48
 $column_model   = array(
49
-                        array('name'=>'name',           'index'=>'name',        'width'=>'120',   'align'=>'left'),
50
-                        array('name'=>'actions',        'index'=>'actions',     'width'=>'100',  'align'=>'left', 'sortable'=>'false')
49
+                        array('name'=>'name', 'index'=>'name', 'width'=>'120', 'align'=>'left'),
50
+                        array('name'=>'actions', 'index'=>'actions', 'width'=>'100', 'align'=>'left', 'sortable'=>'false')
51 51
                        );
52 52
 //Autowidth
53 53
 $extra_params['autowidth'] = 'true';
@@ -55,11 +55,11 @@  discard block
 block discarded – undo
55 55
 $extra_params['height'] = 'auto';
56 56
 
57 57
 //With this function we can add actions to the jgrid (edit, delete, etc)
58
-$htmlHeadXtra[] ='
58
+$htmlHeadXtra[] = '
59 59
 <script>
60 60
 $(function() {
61 61
     // grid definition see the $timeline->display() function
62
-    '.Display::grid_js('timelines',  $url,$columns,$column_model,$extra_params, array(), null,true).'
62
+    '.Display::grid_js('timelines', $url, $columns, $column_model, $extra_params, array(), null, true).'
63 63
 });
64 64
 </script>';
65 65
 
@@ -80,12 +80,12 @@  discard block
 block discarded – undo
80 80
                 $values = $form->exportValues();
81 81
                 $res    = $timeline->save($values);
82 82
                 if ($res) {
83
-                    $message = Display::return_message(get_lang('ItemAdded'),'success');
83
+                    $message = Display::return_message(get_lang('ItemAdded'), 'success');
84 84
                 }
85 85
             }
86 86
             $content = $timeline->listing();
87 87
         } else {
88
-            $actions .= '<a href="'.api_get_self().'">'.Display::return_icon('back.png',get_lang('Back'),'',ICON_SIZE_MEDIUM).'</a>';
88
+            $actions .= '<a href="'.api_get_self().'">'.Display::return_icon('back.png', get_lang('Back'), '', ICON_SIZE_MEDIUM).'</a>';
89 89
             $form->addElement('hidden', 'sec_token');
90 90
             $form->setConstants(array('sec_token' => $token));
91 91
             $content = $form->return_form();
@@ -106,7 +106,7 @@  discard block
 block discarded – undo
106 106
             }
107 107
             $timeline->display();
108 108
         } else {
109
-            $actions = '<a href="'.api_get_self().'">'.Display::return_icon('back.png',get_lang('Back'),'',ICON_SIZE_MEDIUM).'</a>';
109
+            $actions = '<a href="'.api_get_self().'">'.Display::return_icon('back.png', get_lang('Back'), '', ICON_SIZE_MEDIUM).'</a>';
110 110
             $form->addElement('hidden', 'sec_token');
111 111
             $form->setConstants(array('sec_token' => $token));
112 112
             $content = $form->return_form();
@@ -128,7 +128,7 @@  discard block
 block discarded – undo
128 128
             }
129 129
             $timeline->display();
130 130
         } else {
131
-            $actions = '<a href="'.api_get_self().'">'.Display::return_icon('back.png',get_lang('Back'),'',ICON_SIZE_MEDIUM).'</a>';
131
+            $actions = '<a href="'.api_get_self().'">'.Display::return_icon('back.png', get_lang('Back'), '', ICON_SIZE_MEDIUM).'</a>';
132 132
             $form->addElement('hidden', 'sec_token');
133 133
             $form->setConstants(array('sec_token' => $token));
134 134
             $content = $form->return_form();
Please login to merge, or discard this patch.
main/timeline/view.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -6,8 +6,8 @@  discard block
 block discarded – undo
6 6
 */
7 7
 require_once '../inc/global.inc.php';
8 8
 
9
-$interbreadcrumb[]=array('url' => 'index.php','name' => get_lang('Timeline'));
10
-$interbreadcrumb[]=array('url' => 'index.php','name' => get_lang('Listing'));
9
+$interbreadcrumb[] = array('url' => 'index.php', 'name' => get_lang('Timeline'));
10
+$interbreadcrumb[] = array('url' => 'index.php', 'name' => get_lang('Listing'));
11 11
 
12 12
 $timeline = new Timeline();
13 13
 if (empty($_GET['id'])) {
@@ -15,7 +15,7 @@  discard block
 block discarded – undo
15 15
 }
16 16
 $url = $timeline->get_url($_GET['id']);
17 17
 $item = $timeline->get($_GET['id']);
18
-$interbreadcrumb[]=array('url' => '#','name' => $item['headline']);
18
+$interbreadcrumb[] = array('url' => '#', 'name' => $item['headline']);
19 19
 
20 20
 $htmlHeadXtra[] = api_get_css(api_get_path(WEB_LIBRARY_PATH).'javascript/timeline/timeline.css');
21 21
 $htmlHeadXtra[] = api_get_js('timeline/timeline-min.js');
Please login to merge, or discard this patch.
main/gradebook/gradebook_edit_cat.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -62,7 +62,7 @@  discard block
 block discarded – undo
62 62
         $cat->setGenerateCertificates(false);
63 63
     }
64 64
 
65
-    if ($values['hid_parent_id'] == 0 ) {
65
+    if ($values['hid_parent_id'] == 0) {
66 66
         $cat->set_certificate_min_score($values['certif_min_score']);
67 67
     }
68 68
 
@@ -81,12 +81,12 @@  discard block
 block discarded – undo
81 81
     }
82 82
 
83 83
     $cat->save();
84
-    header('Location: '.Security::remove_XSS($_SESSION['gradebook_dest']).'?editcat=&selectcat=' . $cat->get_parent_id().'&'.api_get_cidreq());
84
+    header('Location: '.Security::remove_XSS($_SESSION['gradebook_dest']).'?editcat=&selectcat='.$cat->get_parent_id().'&'.api_get_cidreq());
85 85
     exit;
86 86
 }
87 87
 $selectcat = isset($_GET['selectcat']) ? Security::remove_XSS($_GET['selectcat']) : '';
88 88
 $interbreadcrumb[] = array(
89
-    'url' => Security::remove_XSS($_SESSION['gradebook_dest']) . '?selectcat=' . $selectcat . '&' . api_get_cidreq(),
89
+    'url' => Security::remove_XSS($_SESSION['gradebook_dest']).'?selectcat='.$selectcat.'&'.api_get_cidreq(),
90 90
     'name' => get_lang('Gradebook')
91 91
 );
92 92
 $this_section = SECTION_COURSES;
Please login to merge, or discard this patch.
main/gradebook/gradebook_display_certificate.php 1 patch
Spacing   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -6,7 +6,7 @@  discard block
 block discarded – undo
6 6
  * @package chamilo.gradebook
7 7
  */
8 8
 require_once '../inc/global.inc.php';
9
-$current_course_tool  = TOOL_GRADEBOOK;
9
+$current_course_tool = TOOL_GRADEBOOK;
10 10
 
11 11
 if (!api_is_student_boss()) {
12 12
     api_protect_course_script(true);
@@ -16,9 +16,9 @@  discard block
 block discarded – undo
16 16
 ini_set('max_execution_time', 0);
17 17
 
18 18
 //extra javascript functions for in html head:
19
-$htmlHeadXtra[] ="<script>
19
+$htmlHeadXtra[] = "<script>
20 20
 function confirmation() {
21
-	if (confirm(\" " . trim(get_lang('AreYouSureToDelete')) . " ?\")) {
21
+	if (confirm(\" " . trim(get_lang('AreYouSureToDelete'))." ?\")) {
22 22
 	    return true;
23 23
 	} else {
24 24
 	    return false;
@@ -31,7 +31,7 @@  discard block
 block discarded – undo
31 31
     api_not_allowed(true);
32 32
 }
33 33
 
34
-$cat_id = isset($_GET['cat_id']) ? (int)$_GET['cat_id'] : null;
34
+$cat_id = isset($_GET['cat_id']) ? (int) $_GET['cat_id'] : null;
35 35
 $action = isset($_GET['action']) && $_GET['action'] ? $_GET['action'] : null;
36 36
 $filterOfficialCode = isset($_POST['filter']) ? Security::remove_XSS($_POST['filter']) : null;
37 37
 $filterOfficialCodeGet = isset($_GET['filter']) ? Security::remove_XSS($_GET['filter']) : null;
@@ -72,8 +72,8 @@  discard block
 block discarded – undo
72 72
 
73 73
 $course_code = api_get_course_id();
74 74
 
75
-$interbreadcrumb[] = array('url' => Security::remove_XSS($_SESSION['gradebook_dest']).'?',	'name' => get_lang('Gradebook'));
76
-$interbreadcrumb[] = array('url' => '#','name' => get_lang('GradebookListOfStudentsCertificates'));
75
+$interbreadcrumb[] = array('url' => Security::remove_XSS($_SESSION['gradebook_dest']).'?', 'name' => get_lang('Gradebook'));
76
+$interbreadcrumb[] = array('url' => '#', 'name' => get_lang('GradebookListOfStudentsCertificates'));
77 77
 
78 78
 $this_section = SECTION_COURSES;
79 79
 
@@ -85,7 +85,7 @@  discard block
 block discarded – undo
85 85
         $certificate = new Certificate($_GET['certificate_id']);
86 86
         $result = $certificate->delete(true);
87 87
         Security::clear_token();
88
-        if ($result ==true) {
88
+        if ($result == true) {
89 89
             Display::display_confirmation_message(get_lang('CertificateRemoved'));
90 90
         } else {
91 91
             Display::display_error_message(get_lang('CertificateNotRemoved'));
@@ -104,9 +104,9 @@  discard block
 block discarded – undo
104 104
 
105 105
     //with this fix the teacher only can view 1 gradebook
106 106
     if (api_is_platform_admin()) {
107
-        $stud_id= (api_is_allowed_to_edit() ? null : api_get_user_id());
107
+        $stud_id = (api_is_allowed_to_edit() ? null : api_get_user_id());
108 108
     } else {
109
-        $stud_id= api_get_user_id();
109
+        $stud_id = api_get_user_id();
110 110
     }
111 111
 
112 112
     $total_weight = $cats[0]->get_weight();
@@ -115,7 +115,7 @@  discard block
 block discarded – undo
115 115
     $alleval = $cats[0]->get_evaluations($stud_id);
116 116
     $alllink = $cats[0]->get_links($stud_id);
117 117
 
118
-    $datagen = new GradebookDataGenerator ($allcat,$alleval, $alllink);
118
+    $datagen = new GradebookDataGenerator($allcat, $alleval, $alllink);
119 119
 
120 120
     $total_resource_weight = 0;
121 121
     if (!empty($datagen)) {
@@ -132,7 +132,7 @@  discard block
 block discarded – undo
132 132
                 $newarray[] = array_slice($data, 1);
133 133
             }
134 134
 
135
-            foreach($newarray as $item) {
135
+            foreach ($newarray as $item) {
136 136
                 $total_resource_weight = $total_resource_weight + $item['2'];
137 137
             }
138 138
         }
@@ -150,7 +150,7 @@  discard block
 block discarded – undo
150 150
 if ($filter === 'true') {
151 151
     echo '<br />';
152 152
     $options = UserManager::getOfficialCodeGrouped();
153
-    $options =array_merge(array('all' => get_lang('All')), $options);
153
+    $options = array_merge(array('all' => get_lang('All')), $options);
154 154
     $form = new FormValidator(
155 155
         'official_code_filter',
156 156
         'POST',
@@ -196,7 +196,7 @@  discard block
 block discarded – undo
196 196
 
197 197
 echo $filterForm;
198 198
 
199
-if (count($certificate_list) == 0 ) {
199
+if (count($certificate_list) == 0) {
200 200
     echo Display::display_warning_message(get_lang('NoResultsAvailable'));
201 201
 } else {
202 202
 
@@ -219,7 +219,7 @@  discard block
 block discarded – undo
219 219
             $certificates = Display::url(get_lang('Certificate'), $url, array('target'=>'_blank', 'class' => 'btn btn-default'));
220 220
             echo $certificates;
221 221
             echo '<a onclick="return confirmation();" href="gradebook_display_certificate.php?sec_token='.$token.'&cidReq='.$course_code.'&action=delete&cat_id='.$cat_id.'&certificate_id='.$value_certificate['id'].'">
222
-                    '.Display::return_icon('delete.png',get_lang('Delete')).'
222
+                    '.Display::return_icon('delete.png', get_lang('Delete')).'
223 223
                   </a>';
224 224
             echo '</td></tr>';
225 225
         }
Please login to merge, or discard this patch.
main/gradebook/gradebook_display_summary.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -9,7 +9,7 @@  discard block
 block discarded – undo
9 9
 use ChamiloSession as Session;
10 10
 
11 11
 require_once '../inc/global.inc.php';
12
-$current_course_tool  = TOOL_GRADEBOOK;
12
+$current_course_tool = TOOL_GRADEBOOK;
13 13
 
14 14
 api_protect_course_script();
15 15
 
@@ -21,7 +21,7 @@  discard block
 block discarded – undo
21 21
     api_not_allowed(true);
22 22
 }
23 23
 
24
-$cat_id = isset($_GET['selectcat']) ? (int)$_GET['selectcat'] : null;
24
+$cat_id = isset($_GET['selectcat']) ? (int) $_GET['selectcat'] : null;
25 25
 $action = isset($_GET['action']) && $_GET['action'] ? $_GET['action'] : null;
26 26
 
27 27
 $userList = CourseManager::get_user_list_from_course_code(
@@ -113,8 +113,8 @@  discard block
 block discarded – undo
113 113
 
114 114
 $course_code = api_get_course_id();
115 115
 
116
-$interbreadcrumb[] = array('url' => Security::remove_XSS($_SESSION['gradebook_dest']).'?',	'name' => get_lang('Gradebook'));
117
-$interbreadcrumb[] = array('url' => '#','name' => get_lang('GradebookListOfStudentsReports'));
116
+$interbreadcrumb[] = array('url' => Security::remove_XSS($_SESSION['gradebook_dest']).'?', 'name' => get_lang('Gradebook'));
117
+$interbreadcrumb[] = array('url' => '#', 'name' => get_lang('GradebookListOfStudentsReports'));
118 118
 
119 119
 $this_section = SECTION_COURSES;
120 120
 
@@ -131,7 +131,7 @@  discard block
 block discarded – undo
131 131
 }
132 132
 echo '</div>';
133 133
 
134
-if (count($userList) == 0 ) {
134
+if (count($userList) == 0) {
135 135
     echo Display::display_warning_message(get_lang('NoResultsAvailable'));
136 136
 } else {
137 137
     echo '<br /><br /><table class="data_table">';
Please login to merge, or discard this patch.
main/gradebook/gradebook_scoring_system.php 1 patch
Spacing   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -13,7 +13,7 @@  discard block
 block discarded – undo
13 13
     api_not_allowed();
14 14
 }
15 15
 
16
-$htmlHeadXtra[]= '<script>
16
+$htmlHeadXtra[] = '<script>
17 17
 function plusItem(item) {
18 18
     document.getElementById(item).style.display = "inline";
19 19
     document.getElementById("plus-"+item).style.display = "none";
@@ -45,10 +45,10 @@  discard block
 block discarded – undo
45 45
 );
46 46
 
47 47
 $select_cat = intval($_GET['selectcat']);
48
-$displayscore= ScoreDisplay :: instance();
48
+$displayscore = ScoreDisplay :: instance();
49 49
 $customdisplays = $displayscore->get_custom_score_display_settings();
50 50
 
51
-$nr_items = (count($customdisplays) != '0' )? count($customdisplays) : '1';
51
+$nr_items = (count($customdisplays) != '0') ? count($customdisplays) : '1';
52 52
 $scoreform = new ScoreDisplayForm(
53 53
     'scoring_system_form',
54 54
     api_get_self().'?selectcat='.$select_cat.'&'.api_get_cidreq()
@@ -57,18 +57,18 @@  discard block
 block discarded – undo
57 57
 if ($scoreform->validate()) {
58 58
     $value_export = '';
59 59
     $value_export = $scoreform->exportValues();
60
-    $value_export = isset($value_export) ? $scoreform->exportValues(): '';
60
+    $value_export = isset($value_export) ? $scoreform->exportValues() : '';
61 61
     $values = $value_export;
62 62
 
63 63
     // create new array of custom display settings
64 64
     // this loop also checks if all score ranges are unique
65 65
 
66
-    $scoringdisplay= array ();
66
+    $scoringdisplay = array();
67 67
     $ranges_ok = true;
68
-    $endscore= isset($values['endscore']) ? $values['endscore'] : null;
69
-    $displaytext=isset($values['displaytext']) ? $values['displaytext'] : null;
70
-    for ($counter= 1; $ranges_ok && $counter <= 20; $counter++) {
71
-        $setting= array ();
68
+    $endscore = isset($values['endscore']) ? $values['endscore'] : null;
69
+    $displaytext = isset($values['displaytext']) ? $values['displaytext'] : null;
70
+    for ($counter = 1; $ranges_ok && $counter <= 20; $counter++) {
71
+        $setting = array();
72 72
         $setting['score'] = $endscore[$counter];
73 73
         $setting['display'] = $displaytext[$counter];
74 74
         if (!empty($setting['score'])) {
@@ -77,12 +77,12 @@  discard block
 block discarded – undo
77 77
                     $ranges_ok = false;
78 78
                 }
79 79
             }
80
-            $scoringdisplay[]= $setting;
80
+            $scoringdisplay[] = $setting;
81 81
         }
82 82
     }
83 83
 
84 84
     if (!$ranges_ok) {
85
-        header('Location: ' . api_get_self() . '?nouniqueranges=&selectcat=' . $select_cat.'&'.api_get_cidreq());
85
+        header('Location: '.api_get_self().'?nouniqueranges=&selectcat='.$select_cat.'&'.api_get_cidreq());
86 86
         exit;
87 87
     }
88 88
 
@@ -102,8 +102,8 @@  discard block
 block discarded – undo
102 102
 $this_section = SECTION_COURSES;
103 103
 Display :: display_header(get_lang('ScoreEdit'));
104 104
 
105
-if (((isset($_GET['isStudentView']) && $_GET['isStudentView']=='false') ||
106
-    (isset($_GET['selectcat']) && ($_SESSION['studentview']=='teacherview')))
105
+if (((isset($_GET['isStudentView']) && $_GET['isStudentView'] == 'false') ||
106
+    (isset($_GET['selectcat']) && ($_SESSION['studentview'] == 'teacherview')))
107 107
 ) {
108 108
     if (isset ($_GET['scoringupdated'])) {
109 109
         Display::display_confirmation_message(get_lang('ScoringUpdated'), false);
Please login to merge, or discard this patch.
main/gradebook/gradebook_edit_all.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -79,7 +79,7 @@
 block discarded – undo
79 79
 
80 80
 $submitted = isset($_POST['submitted']) ? $_POST['submitted'] : '';
81 81
 if ($submitted == 1) {
82
-    Display :: display_confirmation_message(get_lang('GradebookWeightUpdated')) . '<br /><br />';
82
+    Display :: display_confirmation_message(get_lang('GradebookWeightUpdated')).'<br /><br />';
83 83
     if (isset($_POST['evaluation'])) {
84 84
         $eval_log = new Evaluation();
85 85
     }
Please login to merge, or discard this patch.
main/gradebook/my_certificates.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -36,7 +36,7 @@
 block discarded – undo
36 36
         'actions',
37 37
         Display::toolbarButton(
38 38
             get_lang('SearchCertificates'),
39
-            api_get_path(WEB_CODE_PATH) . "gradebook/search.php",
39
+            api_get_path(WEB_CODE_PATH)."gradebook/search.php",
40 40
             'search',
41 41
             'info'
42 42
         )
Please login to merge, or discard this patch.