Completed
Pull Request — 1.11.x (#1661)
by José
27:18
created
src/Chamilo/ThemeBundle/DependencyInjection/ChamiloAdminThemeExtension.php 1 patch
Indentation   +124 added lines, -124 removed lines patch added patch discarded remove patch
@@ -61,134 +61,134 @@
 block discarded – undo
61 61
 
62 62
         if (isset($bundles['AsseticBundle']) && 0) {
63 63
             $container->prependExtensionConfig(
64
-                      'assetic',
65
-                          array(
66
-                              'bundles' => array(
64
+                        'assetic',
65
+                            array(
66
+                                'bundles' => array(
67 67
                                 'ChamiloThemeBundle'
68 68
                                 ),
69
-                              'assets' => array(
70
-                                  'common_js'              => array(
71
-                                      'inputs' => array(
72
-                                          $jsAssets . 'public/vendor/jquery/dist/jquery.js',
73
-                                          $jsAssets . 'public/vendor/jquery-ui/jquery-ui.js',
74
-                                          $jsAssets . 'public/vendor/underscore/underscore.js',
75
-                                          $jsAssets . 'public/vendor/backbone/backbone.js',
76
-                                          $jsAssets . 'public/vendor/marionette/lib/backbone.marionette.js',
77
-                                          $jsAssets . 'public/vendor/bootstrap/dist/js/bootstrap.min.js',
78
-                                          $jsAssets . 'public/vendor/bootbox/bootbox.js',
79
-                                          $jsAssets . 'public/js/dialogs.js',
80
-                                          $jsAssets . 'public/js/namespace.js',
81
-                                      ),
82
-                                  ),
83
-                                  'tools_js'               => array(
84
-                                      'inputs' => array(
85
-                                          '@common_js',
86
-                                          $jsAssets . 'public/vendor/momentjs/moment.js',
87
-                                          $jsAssets . 'public/vendor/holderjs/holder.js',
88
-                                          $jsAssets . 'public/vendor/spinjs/spin.js',
89
-                                      ),
90
-                                  ),
91
-                                  'admin_lte_js'           => array(
92
-                                      'inputs' => array(
93
-                                          $lteJs . 'plugins/bootstrap-slider/bootstrap-slider.js',
94
-                                          $lteJs . 'plugins/datatables/jquery.dataTables.js',
95
-                                          $lteJs . 'plugins/datatables/dataTables.bootstrap.js',
96
-                                          $lteJs . 'plugins/slimScroll/jquery.slimscroll.js',
97
-                                          $jsAssets . 'public/js/adminLTE.js',
98
-                                      )
99
-                                  ),
100
-                                  'admin_lte_css'          => array(
101
-                                      'inputs' => array(
69
+                                'assets' => array(
70
+                                    'common_js'              => array(
71
+                                        'inputs' => array(
72
+                                            $jsAssets . 'public/vendor/jquery/dist/jquery.js',
73
+                                            $jsAssets . 'public/vendor/jquery-ui/jquery-ui.js',
74
+                                            $jsAssets . 'public/vendor/underscore/underscore.js',
75
+                                            $jsAssets . 'public/vendor/backbone/backbone.js',
76
+                                            $jsAssets . 'public/vendor/marionette/lib/backbone.marionette.js',
77
+                                            $jsAssets . 'public/vendor/bootstrap/dist/js/bootstrap.min.js',
78
+                                            $jsAssets . 'public/vendor/bootbox/bootbox.js',
79
+                                            $jsAssets . 'public/js/dialogs.js',
80
+                                            $jsAssets . 'public/js/namespace.js',
81
+                                        ),
82
+                                    ),
83
+                                    'tools_js'               => array(
84
+                                        'inputs' => array(
85
+                                            '@common_js',
86
+                                            $jsAssets . 'public/vendor/momentjs/moment.js',
87
+                                            $jsAssets . 'public/vendor/holderjs/holder.js',
88
+                                            $jsAssets . 'public/vendor/spinjs/spin.js',
89
+                                        ),
90
+                                    ),
91
+                                    'admin_lte_js'           => array(
92
+                                        'inputs' => array(
93
+                                            $lteJs . 'plugins/bootstrap-slider/bootstrap-slider.js',
94
+                                            $lteJs . 'plugins/datatables/jquery.dataTables.js',
95
+                                            $lteJs . 'plugins/datatables/dataTables.bootstrap.js',
96
+                                            $lteJs . 'plugins/slimScroll/jquery.slimscroll.js',
97
+                                            $jsAssets . 'public/js/adminLTE.js',
98
+                                        )
99
+                                    ),
100
+                                    'admin_lte_css'          => array(
101
+                                        'inputs' => array(
102 102
 
103 103
                                         //  $lteCss . 'jQueryUI/jquery-ui-1.10.3.custom.css',
104
-                                         $cssAssets . 'vendor/bootstrap/dist/css/bootstrap.min.css',
105
-                                          $lteCss . 'bootstrap-slider/slider.css',
106
-                                          $lteCss . 'datatables/dataTables.bootstrap.css',
107
-                                          $cssAssets . 'vendor/fontawesome/css/font-awesome.min.css',
108
-                                          $cssAssets . 'vendor/ionicons/css/ionicons.min.css',
109
-                                          $lteCss . 'AdminLTE.css',
110
-                                          //$lteFont . 'fontawesome-webfont.eot',
111
-                                          // $lteFont . 'ionicons.eot',
112
-                                      )
113
-                                  ),
114
-                                  'admin_lte_forms_js'     => array(
115
-                                      'inputs' => array(
116
-                                          $lteJs . 'plugins/colorpicker/bootstrap-colorpicker.js',
117
-                                          $lteJs . 'plugins/daterangepicker/daterangepicker.js',
118
-                                          $lteJs . 'plugins/timepicker/bootstrap-timepicker.js',
119
-                                          $lteJs . 'plugins/input-mask/jquery.inputmask.js',
120
-                                          //   $lteJs.'plugins/input-mask/*',
121
-                                      )
122
-                                  ),
123
-                                  'admin_lte_forms_css'    => array(
124
-                                      'inputs' => array(
125
-                                          $lteCss . 'colorpicker/bootstrap-colorpicker.css',
126
-                                          $lteCss . 'daterangepicker/daterangepicker-bs3.css',
127
-                                          $lteCss . 'timepicker/bootstrap-timepicker.css',
128
-                                      )
129
-                                  ),
130
-                                  'admin_lte_wysiwyg'      => array(
131
-                                      'inputs' => array(
132
-                                          $lteJs . 'plugins/bootstrap-wysihtml5/bootstrap3-wysihtml5.js',
133
-                                      )
134
-                                  ),
135
-                                  'admin_lte_wysiwyg_css'  => array(
136
-                                      'inputs' => array(
137
-                                          $lteCss . 'bootstrap-wysihtml5/bootstrap3-wysihtml5.css',
138
-                                      )
139
-                                  ),
140
-                                  'admin_lte_morris'       => array(
141
-                                      'inputs' => array(
142
-                                          $lteJs . 'plugins/morris/morris.js',
143
-                                      )
144
-                                  ),
145
-                                  'admin_lte_morris_css'   => array(
146
-                                      'inputs' => array(
147
-                                          $lteCss . 'morris/morris.css',
148
-                                      )
149
-                                  ),
150
-                                  'admin_lte_flot'         => array(
151
-                                      'inputs' => array(
152
-                                          $lteJs . 'plugins/flot/*',
153
-                                      )
154
-                                  ),
155
-                                  'admin_lte_calendar'     => array(
156
-                                      'inputs' => array(
157
-                                          $jsAssets . 'public/vendor/fullcalendar/dist/fullcalendar.min.js',
158
-                                      )
159
-                                  ),
160
-                                  'admin_lte_calendar_css' => array(
161
-                                      'inputs' => array(
162
-                                          $lteCss . 'fullcalendar/fullcalendar.css',
163
-                                      )
164
-                                  ),
165
-                                  'avatar_img'             => array(
166
-                                      'inputs' => array(
167
-                                          '@ChamiloThemeBundle/Resources/public/img/avatar.png'
168
-                                      )
169
-                                  ),
170
-                                  'admin_lte_all'          => array(
171
-                                      'inputs' => array(
172
-                                          '@tools_js',
173
-                                          '@admin_lte_forms_js',
174
-                                          '@admin_lte_wysiwyg',
175
-                                          '@admin_lte_morris',
176
-                                          '@admin_lte_calendar',
177
-                                          '@admin_lte_js',
178
-                                          //  '@admin_lte_flot',
179
-                                      )
180
-                                  ),
181
-                                  'admin_lte_all_css'      => array(
182
-                                      'inputs' => array(
183
-                                          '@admin_lte_calendar_css',
184
-                                          '@admin_lte_morris_css',
185
-                                          '@admin_lte_wysiwyg_css',
186
-                                          '@admin_lte_forms_css',
187
-                                          '@admin_lte_css'
188
-                                      )
189
-                                  ),
190
-                              )
191
-                          )
104
+                                            $cssAssets . 'vendor/bootstrap/dist/css/bootstrap.min.css',
105
+                                            $lteCss . 'bootstrap-slider/slider.css',
106
+                                            $lteCss . 'datatables/dataTables.bootstrap.css',
107
+                                            $cssAssets . 'vendor/fontawesome/css/font-awesome.min.css',
108
+                                            $cssAssets . 'vendor/ionicons/css/ionicons.min.css',
109
+                                            $lteCss . 'AdminLTE.css',
110
+                                            //$lteFont . 'fontawesome-webfont.eot',
111
+                                            // $lteFont . 'ionicons.eot',
112
+                                        )
113
+                                    ),
114
+                                    'admin_lte_forms_js'     => array(
115
+                                        'inputs' => array(
116
+                                            $lteJs . 'plugins/colorpicker/bootstrap-colorpicker.js',
117
+                                            $lteJs . 'plugins/daterangepicker/daterangepicker.js',
118
+                                            $lteJs . 'plugins/timepicker/bootstrap-timepicker.js',
119
+                                            $lteJs . 'plugins/input-mask/jquery.inputmask.js',
120
+                                            //   $lteJs.'plugins/input-mask/*',
121
+                                        )
122
+                                    ),
123
+                                    'admin_lte_forms_css'    => array(
124
+                                        'inputs' => array(
125
+                                            $lteCss . 'colorpicker/bootstrap-colorpicker.css',
126
+                                            $lteCss . 'daterangepicker/daterangepicker-bs3.css',
127
+                                            $lteCss . 'timepicker/bootstrap-timepicker.css',
128
+                                        )
129
+                                    ),
130
+                                    'admin_lte_wysiwyg'      => array(
131
+                                        'inputs' => array(
132
+                                            $lteJs . 'plugins/bootstrap-wysihtml5/bootstrap3-wysihtml5.js',
133
+                                        )
134
+                                    ),
135
+                                    'admin_lte_wysiwyg_css'  => array(
136
+                                        'inputs' => array(
137
+                                            $lteCss . 'bootstrap-wysihtml5/bootstrap3-wysihtml5.css',
138
+                                        )
139
+                                    ),
140
+                                    'admin_lte_morris'       => array(
141
+                                        'inputs' => array(
142
+                                            $lteJs . 'plugins/morris/morris.js',
143
+                                        )
144
+                                    ),
145
+                                    'admin_lte_morris_css'   => array(
146
+                                        'inputs' => array(
147
+                                            $lteCss . 'morris/morris.css',
148
+                                        )
149
+                                    ),
150
+                                    'admin_lte_flot'         => array(
151
+                                        'inputs' => array(
152
+                                            $lteJs . 'plugins/flot/*',
153
+                                        )
154
+                                    ),
155
+                                    'admin_lte_calendar'     => array(
156
+                                        'inputs' => array(
157
+                                            $jsAssets . 'public/vendor/fullcalendar/dist/fullcalendar.min.js',
158
+                                        )
159
+                                    ),
160
+                                    'admin_lte_calendar_css' => array(
161
+                                        'inputs' => array(
162
+                                            $lteCss . 'fullcalendar/fullcalendar.css',
163
+                                        )
164
+                                    ),
165
+                                    'avatar_img'             => array(
166
+                                        'inputs' => array(
167
+                                            '@ChamiloThemeBundle/Resources/public/img/avatar.png'
168
+                                        )
169
+                                    ),
170
+                                    'admin_lte_all'          => array(
171
+                                        'inputs' => array(
172
+                                            '@tools_js',
173
+                                            '@admin_lte_forms_js',
174
+                                            '@admin_lte_wysiwyg',
175
+                                            '@admin_lte_morris',
176
+                                            '@admin_lte_calendar',
177
+                                            '@admin_lte_js',
178
+                                            //  '@admin_lte_flot',
179
+                                        )
180
+                                    ),
181
+                                    'admin_lte_all_css'      => array(
182
+                                        'inputs' => array(
183
+                                            '@admin_lte_calendar_css',
184
+                                            '@admin_lte_morris_css',
185
+                                            '@admin_lte_wysiwyg_css',
186
+                                            '@admin_lte_forms_css',
187
+                                            '@admin_lte_css'
188
+                                        )
189
+                                    ),
190
+                                )
191
+                            )
192 192
             );
193 193
 
194 194
         }
Please login to merge, or discard this patch.
src/Chamilo/CoreBundle/Admin/UserGroupAdmin.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -28,7 +28,7 @@
 block discarded – undo
28 28
             ->add('users', 'sonata_type_collection', array(
29 29
                     'cascade_validation' => true,
30 30
                 ), array(
31
-                   // 'allow_delete' => true,
31
+                    // 'allow_delete' => true,
32 32
                     'by_reference' => false,
33 33
                     'edit'              => 'inline',
34 34
                     'inline'            => 'table',
Please login to merge, or discard this patch.
main/session/session_category_add.php 1 patch
Indentation   +28 added lines, -28 removed lines patch added patch discarded remove patch
@@ -29,29 +29,29 @@  discard block
 block discarded – undo
29 29
 $tbl_session = Database::get_main_table(TABLE_MAIN_SESSION);
30 30
 
31 31
 if (isset($_POST['formSent']) && $_POST['formSent']) {
32
-	$formSent = 1;
33
-	$name = $_POST['name'];
34
-	$year_start = $_POST['year_start'];
35
-	$month_start = $_POST['month_start'];
36
-	$day_start = $_POST['day_start'];
37
-	$year_end = $_POST['year_end'];
38
-	$month_end = $_POST['month_end'];
39
-	$day_end = $_POST['day_end'];
40
-	$return = SessionManager::create_category_session(
41
-		$name,
42
-		$year_start,
43
-		$month_start,
44
-		$day_start,
45
-		$year_end,
46
-		$month_end,
47
-		$day_end
48
-	);
49
-
50
-	if ($return == strval(intval($return))) {
51
-		Display::addFlash(Display::return_message(get_lang('SessionCategoryAdded')));
52
-		header('Location: session_category_list.php');
53
-		exit();
54
-	}
32
+    $formSent = 1;
33
+    $name = $_POST['name'];
34
+    $year_start = $_POST['year_start'];
35
+    $month_start = $_POST['month_start'];
36
+    $day_start = $_POST['day_start'];
37
+    $year_end = $_POST['year_end'];
38
+    $month_end = $_POST['month_end'];
39
+    $day_end = $_POST['day_end'];
40
+    $return = SessionManager::create_category_session(
41
+        $name,
42
+        $year_start,
43
+        $month_start,
44
+        $day_start,
45
+        $year_end,
46
+        $month_end,
47
+        $day_end
48
+    );
49
+
50
+    if ($return == strval(intval($return))) {
51
+        Display::addFlash(Display::return_message(get_lang('SessionCategoryAdded')));
52
+        header('Location: session_category_list.php');
53
+        exit();
54
+    }
55 55
 }
56 56
 $thisYear = date('Y');
57 57
 $thisMonth = date('m');
@@ -61,7 +61,7 @@  discard block
 block discarded – undo
61 61
 //display the header
62 62
 Display::display_header($tool_name);
63 63
 if (!empty($return)) {
64
-	Display::display_error_message($return,false);
64
+    Display::display_error_message($return,false);
65 65
 }
66 66
 ?>
67 67
 <div class="row">
@@ -139,12 +139,12 @@  discard block
 block discarded – undo
139 139
                     /
140 140
                       <select name="year_start">
141 141
                       <?php
142
-                      for ($i=$thisYear-5;$i <= ($thisYear+5);$i++) {
143
-                      ?>
142
+                        for ($i=$thisYear-5;$i <= ($thisYear+5);$i++) {
143
+                        ?>
144 144
                               <option value="<?php echo $i; ?>" <?php if((!$formSent && $thisYear == $i) || ($formSent && $year_start == $i)) echo 'selected="selected"'; ?> ><?php echo $i; ?></option>
145 145
                       <?php
146
-                      }
147
-                      ?>
146
+                        }
147
+                        ?>
148 148
                         </select>
149 149
                 </div>
150 150
                 <div class="col-md-3"></div>
Please login to merge, or discard this patch.
main/course_progress/thematic_plan.php 1 patch
Indentation   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -47,15 +47,15 @@
 block discarded – undo
47 47
         $form->addElement('hidden', 'description_type['.$id.']', $id);
48 48
         $form->addText('title['.$id.']', get_lang('Title'), false, array('size'=>'50'));
49 49
         $form->addHtmlEditor(
50
-           'description['.$id.']',
51
-           get_lang('Description'),
52
-           false,
53
-           false,
54
-           array(
55
-               'ToolbarStartExpanded' => 'false',
56
-               'ToolbarSet' => 'TrainingDescription',
57
-               'Height' => '150'
58
-           )
50
+            'description['.$id.']',
51
+            get_lang('Description'),
52
+            false,
53
+            false,
54
+            array(
55
+                'ToolbarStartExpanded' => 'false',
56
+                'ToolbarSet' => 'TrainingDescription',
57
+                'Height' => '150'
58
+            )
59 59
         );
60 60
 
61 61
         if (!empty($thematic_simple_list) && in_array($id, $thematic_simple_list)) {
Please login to merge, or discard this patch.
main/reports/reports.lib.php 1 patch
Indentation   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -14,9 +14,9 @@  discard block
 block discarded – undo
14 14
 
15 15
 // load templates
16 16
 function reports_loadTemplates() {
17
-	global $reports_enabled_templates, $reports_template;
18
-	foreach ($reports_enabled_templates as $t)
19
-		require_once 'templates/'.$t.'.reports.php';
17
+    global $reports_enabled_templates, $reports_template;
18
+    foreach ($reports_enabled_templates as $t)
19
+        require_once 'templates/'.$t.'.reports.php';
20 20
 }
21 21
 
22 22
 
@@ -149,18 +149,18 @@  discard block
 block discarded – undo
149 149
  */
150 150
 // return tools ID (parametre is a constant from main_api
151 151
 function reports_getToolId($tool) {
152
-	$tools = array_flip(api_get_tools_lists());
153
-	if (array_key_exists($tool, $tools))
154
-		return $tools[$tool];
155
-	else
156
-		return null;
152
+    $tools = array_flip(api_get_tools_lists());
153
+    if (array_key_exists($tool, $tools))
154
+        return $tools[$tool];
155
+    else
156
+        return null;
157 157
 }
158 158
 
159 159
 // return a sql clause returning triplet of (course, $session, $uid) the
160 160
 // current user is authorized to reed
161 161
 function reports_getVisibilitySQL () {
162
-	return "select cru.user_id from ".Database::get_main_table(TABLE_MAIN_COURSE_USER).' cru';
163
-	// fixme sessions
162
+    return "select cru.user_id from ".Database::get_main_table(TABLE_MAIN_COURSE_USER).' cru';
163
+    // fixme sessions
164 164
 }
165 165
 
166 166
 // this function execute keys_query (SQL statement)
Please login to merge, or discard this patch.
plugin/dashboard/block_teacher_graph/block_teacher_graph.class.php 1 patch
Indentation   +74 added lines, -74 removed lines patch added patch discarded remove patch
@@ -26,32 +26,32 @@  discard block
 block discarded – undo
26 26
     private $path;
27 27
     private $permission = array(DRH);
28 28
 
29
-	/**
30
-	 * Controller
31
-	 */
29
+    /**
30
+     * Controller
31
+     */
32 32
     public function __construct ($user_id)
33 33
     {
34
-    	$this->user_id  = $user_id;
35
-    	$this->path 	= 'block_teacher_graph';
36
-    	if ($this->is_block_visible_for_user($user_id)) {
34
+        $this->user_id  = $user_id;
35
+        $this->path 	= 'block_teacher_graph';
36
+        if ($this->is_block_visible_for_user($user_id)) {
37 37
             $this->teachers = UserManager::get_users_followed_by_drh($user_id, COURSEMANAGER);
38
-    	}
38
+        }
39 39
     }
40 40
 
41 41
     /**
42
-	 * This method check if a user is allowed to see the block inside dashboard interface
43
-	 * @param	int		User id
44
-	 * @return	bool	Is block visible for user
45
-	 */
42
+     * This method check if a user is allowed to see the block inside dashboard interface
43
+     * @param	int		User id
44
+     * @return	bool	Is block visible for user
45
+     */
46 46
     public function is_block_visible_for_user($user_id)
47 47
     {
48
-    	$user_info = api_get_user_info($user_id);
49
-		$user_status = $user_info['status'];
50
-		$is_block_visible_for_user = false;
51
-    	if (UserManager::is_admin($user_id) || in_array($user_status, $this->permission)) {
52
-    		$is_block_visible_for_user = true;
53
-    	}
54
-    	return $is_block_visible_for_user;
48
+        $user_info = api_get_user_info($user_id);
49
+        $user_status = $user_info['status'];
50
+        $is_block_visible_for_user = false;
51
+        if (UserManager::is_admin($user_id) || in_array($user_status, $this->permission)) {
52
+            $is_block_visible_for_user = true;
53
+        }
54
+        return $is_block_visible_for_user;
55 55
     }
56 56
 
57 57
     /**
@@ -61,11 +61,11 @@  discard block
 block discarded – undo
61 61
      */
62 62
     public function get_block()
63 63
     {
64
-    	global $charset;
65
-    	$column = 1;
66
-    	$data   = array();
67
-		$teacher_information_graph = $this->get_teachers_information_graph();
68
-		$html = '
64
+        global $charset;
65
+        $column = 1;
66
+        $data   = array();
67
+        $teacher_information_graph = $this->get_teachers_information_graph();
68
+        $html = '
69 69
                 <div class="panel panel-default" id="intro">
70 70
                     <div class="panel-heading">'.get_lang('TeachersInformationsGraph').'
71 71
                         <div class="pull-right"><a class="btn btn-danger btn-xs"  onclick="javascript:if(!confirm(\''.addslashes(api_htmlentities(get_lang('ConfirmYourChoice'),ENT_QUOTES,$charset)).'\')) return false;" href="index.php?action=disable_block&path='.$this->path.'">
@@ -79,53 +79,53 @@  discard block
 block discarded – undo
79 79
                 </div>
80 80
 				';
81 81
 
82
-    	$data['column'] = $column;
83
-    	$data['content_html'] = $html;
82
+        $data['column'] = $column;
83
+        $data['content_html'] = $html;
84 84
 
85
-    	return $data;
85
+        return $data;
86 86
 
87 87
     }
88 88
 
89 89
     /**
90
- 	 * This method return a content html, it's used inside get_block method for showing it inside dashboard interface
91
- 	 * @return string  content html
92
- 	 */
90
+     * This method return a content html, it's used inside get_block method for showing it inside dashboard interface
91
+     * @return string  content html
92
+     */
93 93
     public function get_teachers_information_graph()
94 94
     {
95
-	 	$teachers = $this->teachers;
96
-		$graph = '';
97
-
98
- 		$user_ids = array_keys($teachers);
99
- 		$a_last_week = get_last_week();
100
-
101
-		if (is_array($user_ids) && count($user_ids) > 0) {
102
-			$dataSet = new pData;
103
-			foreach ($user_ids as $user_id) {
104
-				$teacher_info = api_get_user_info($user_id);
105
-				$username = $teacher_info['username'];
106
-				$time_by_days = array();
107
-				foreach ($a_last_week as $day) {
108
-					// day is received as y-m-d 12:00:00
109
-					$start_date = api_get_utc_datetime($day);
110
-					$end_date = api_get_utc_datetime($day+(3600*24-1));
111
-
112
-					$time_on_platform_by_day = Tracking::get_time_spent_on_the_platform($user_id, 'custom', $start_date, $end_date);
113
-					$hours = floor($time_on_platform_by_day / 3600);
114
-					$min = floor(($time_on_platform_by_day - ($hours * 3600)) / 60);
115
-					$time_by_days[] = $min;
116
-				}
117
-				$dataSet->addPoints($time_by_days, $username);
118
-			}
119
-
120
-			$last_week 	 = date('Y-m-d',$a_last_week[0]).' '.get_lang('To').' '.date('Y-m-d', $a_last_week[6]);
121
-			$days_on_week = array();
122
-			foreach ($a_last_week as $weekday) {
123
-				$days_on_week[] = date('d/m',$weekday);
124
-			}
125
-
126
-			$dataSet->addPoints($days_on_week, 'Days');
127
-			$dataSet->setAbscissaName($last_week);
128
-			$dataSet->setAxisName(0, get_lang('Minutes'));
95
+            $teachers = $this->teachers;
96
+        $graph = '';
97
+
98
+            $user_ids = array_keys($teachers);
99
+            $a_last_week = get_last_week();
100
+
101
+        if (is_array($user_ids) && count($user_ids) > 0) {
102
+            $dataSet = new pData;
103
+            foreach ($user_ids as $user_id) {
104
+                $teacher_info = api_get_user_info($user_id);
105
+                $username = $teacher_info['username'];
106
+                $time_by_days = array();
107
+                foreach ($a_last_week as $day) {
108
+                    // day is received as y-m-d 12:00:00
109
+                    $start_date = api_get_utc_datetime($day);
110
+                    $end_date = api_get_utc_datetime($day+(3600*24-1));
111
+
112
+                    $time_on_platform_by_day = Tracking::get_time_spent_on_the_platform($user_id, 'custom', $start_date, $end_date);
113
+                    $hours = floor($time_on_platform_by_day / 3600);
114
+                    $min = floor(($time_on_platform_by_day - ($hours * 3600)) / 60);
115
+                    $time_by_days[] = $min;
116
+                }
117
+                $dataSet->addPoints($time_by_days, $username);
118
+            }
119
+
120
+            $last_week 	 = date('Y-m-d',$a_last_week[0]).' '.get_lang('To').' '.date('Y-m-d', $a_last_week[6]);
121
+            $days_on_week = array();
122
+            foreach ($a_last_week as $weekday) {
123
+                $days_on_week[] = date('d/m',$weekday);
124
+            }
125
+
126
+            $dataSet->addPoints($days_on_week, 'Days');
127
+            $dataSet->setAbscissaName($last_week);
128
+            $dataSet->setAxisName(0, get_lang('Minutes'));
129 129
             $dataSet->setAbscissa('Days');
130 130
             $dataSet->loadPalette(api_get_path(SYS_CODE_PATH) . 'palettes/pchart/default.color', true);
131 131
 
@@ -194,20 +194,20 @@  discard block
 block discarded – undo
194 194
                 $imgPath = api_get_path(WEB_ARCHIVE_PATH) . $chartHash;
195 195
             }
196 196
             $graph = '<img src="' . $imgPath . '" >';
197
-		} else {
198
-			$graph = '<p>'.api_convert_encoding(get_lang('GraphicNotAvailable'), 'UTF-8').'</p>';
199
-		}
197
+        } else {
198
+            $graph = '<p>'.api_convert_encoding(get_lang('GraphicNotAvailable'), 'UTF-8').'</p>';
199
+        }
200 200
 
201
- 		return $graph;
202
-	}
201
+            return $graph;
202
+    }
203 203
 
204 204
     /**
205
-	 * Get number of teachers
206
-	 * @return int
207
-	 */
208
-	function get_number_of_teachers()
205
+     * Get number of teachers
206
+     * @return int
207
+     */
208
+    function get_number_of_teachers()
209 209
     {
210
-		return count($this->teachers);
211
-	}
210
+        return count($this->teachers);
211
+    }
212 212
 
213 213
 }
Please login to merge, or discard this patch.
main/cron/document/finddoc.php 1 patch
Indentation   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -8,19 +8,19 @@
 block discarded – undo
8 8
 die();
9 9
 require '../../inc/global.inc.php';
10 10
 if (empty($_GET['doc'])) {
11
-  echo "To add a document name to search, add ?doc=abc to the URL";
11
+    echo "To add a document name to search, add ?doc=abc to the URL";
12 12
 } else {
13
-  echo "Received param ".Security::remove_XSS($_GET['doc'])."<br />";
13
+    echo "Received param ".Security::remove_XSS($_GET['doc'])."<br />";
14 14
 }
15 15
 $courses_list =  CourseManager::get_courses_list();
16 16
 foreach ($courses_list as $course) {
17
-  $title = Database::escape_string($_GET['doc']);
18
-  $td = Database::get_course_table(TABLE_DOCUMENT);
19
-  $sql = "SELECT id, path FROM $td WHERE c_id = ".$course['id']." AND path LIKE '%$title%' OR title LIKE '%$title%'";
20
-  $res = Database::query($sql);
21
-  if (Database::num_rows($res)>0) {
17
+    $title = Database::escape_string($_GET['doc']);
18
+    $td = Database::get_course_table(TABLE_DOCUMENT);
19
+    $sql = "SELECT id, path FROM $td WHERE c_id = ".$course['id']." AND path LIKE '%$title%' OR title LIKE '%$title%'";
20
+    $res = Database::query($sql);
21
+    if (Database::num_rows($res)>0) {
22 22
     while ($row = Database::fetch_array($res)) {
23
-      echo "Found doc ".$row['id']."-> ".$row['path']." in course ".$course['code']."<br />";
23
+        echo "Found doc ".$row['id']."-> ".$row['path']." in course ".$course['code']."<br />";
24
+    }
24 25
     }
25
-  }
26 26
 }
Please login to merge, or discard this patch.
main/inc/lib/table_sort.class.php 1 patch
Indentation   +104 added lines, -104 removed lines patch added patch discarded remove patch
@@ -15,16 +15,16 @@  discard block
 block discarded – undo
15 15
 class TableSort
16 16
 {
17 17
     /**
18
-    * Sorts 2-dimensional table.
19
-    * @param array $data The data to be sorted.
20
-    * @param int $column The column on which the data should be sorted (default = 0)
21
-    * @param int $direction The direction to sort (SORT_ASC (default) or SORT_DESC)
22
-    * @param int $type How should data be sorted (SORT_REGULAR, SORT_NUMERIC,
23
-    * SORT_STRING,SORT_DATE,SORT_IMAGE)
24
-    * @return array The sorted dataset
25
-    * @author [email protected]
26
-    */
27
-	public static function sort_table($data, $column = 0, $direction = SORT_ASC, $type = SORT_REGULAR)
18
+     * Sorts 2-dimensional table.
19
+     * @param array $data The data to be sorted.
20
+     * @param int $column The column on which the data should be sorted (default = 0)
21
+     * @param int $direction The direction to sort (SORT_ASC (default) or SORT_DESC)
22
+     * @param int $type How should data be sorted (SORT_REGULAR, SORT_NUMERIC,
23
+     * SORT_STRING,SORT_DATE,SORT_IMAGE)
24
+     * @return array The sorted dataset
25
+     * @author [email protected]
26
+     */
27
+    public static function sort_table($data, $column = 0, $direction = SORT_ASC, $type = SORT_REGULAR)
28 28
     {
29 29
         if (!is_array($data) || empty($data)) {
30 30
             return array();
@@ -71,20 +71,20 @@  discard block
 block discarded – undo
71 71
         usort($data, create_function('$a, $b', $compare_function));
72 72
 
73 73
         return $data;
74
-	}
74
+    }
75 75
 
76
-	/**
77
-	 * Sorts 2-dimensional table. It is possile changing the columns that will be shown and the way that the columns are to be sorted.
78
-	 * @param array $data The data to be sorted.
79
-	 * @param int $column The column on which the data should be sorted (default = 0)
80
-	 * @param string $direction The direction to sort (SORT_ASC (default) orSORT_DESC)
81
-	 * @param array $column_show The columns that we will show in the table i.e: $column_show = array('1','0','1') we will show the 1st and the 3th column.
82
-	 * @param array $column_order Changes how the columns will be sorted ie. $column_order = array('0','3','2','3') The column [1] will be sorted like the column [3]
83
-	 * @param constant $type How should data be sorted (SORT_REGULAR, SORT_NUMERIC, SORT_STRING, SORT_DATE, SORT_IMAGE)
84
-	 * @return array The sorted dataset
85
-	 * @author [email protected]
86
-	 */
87
-	public static function sort_table_config(
76
+    /**
77
+     * Sorts 2-dimensional table. It is possile changing the columns that will be shown and the way that the columns are to be sorted.
78
+     * @param array $data The data to be sorted.
79
+     * @param int $column The column on which the data should be sorted (default = 0)
80
+     * @param string $direction The direction to sort (SORT_ASC (default) orSORT_DESC)
81
+     * @param array $column_show The columns that we will show in the table i.e: $column_show = array('1','0','1') we will show the 1st and the 3th column.
82
+     * @param array $column_order Changes how the columns will be sorted ie. $column_order = array('0','3','2','3') The column [1] will be sorted like the column [3]
83
+     * @param constant $type How should data be sorted (SORT_REGULAR, SORT_NUMERIC, SORT_STRING, SORT_DATE, SORT_IMAGE)
84
+     * @return array The sorted dataset
85
+     * @author [email protected]
86
+     */
87
+    public static function sort_table_config(
88 88
         $data,
89 89
         $column = 0,
90 90
         $direction = SORT_ASC,
@@ -132,9 +132,9 @@  discard block
 block discarded – undo
132 132
             if (!empty($data)) {
133 133
                 foreach ($data as $document) {
134 134
                     if ($document['type'] == 'folder') {
135
-                      $docs_to_sort[$document['id']]   = api_strtolower($document['name']);
135
+                        $docs_to_sort[$document['id']]   = api_strtolower($document['name']);
136 136
                     } else {
137
-                      $folder_to_sort[$document['id']] = api_strtolower($document['name']);
137
+                        $folder_to_sort[$document['id']] = api_strtolower($document['name']);
138 138
                     }
139 139
                     $new_data[$document['id']] = $document;
140 140
                 }
@@ -196,91 +196,91 @@  discard block
 block discarded – undo
196 196
             usort($data, create_function('$a, $b', $compare_function));
197 197
         }
198 198
 
199
-		if (is_array($column_show) && !empty($column_show)) {
199
+        if (is_array($column_show) && !empty($column_show)) {
200 200
 
201
-			// We show only the columns data that were set up on the $column_show array
202
-			$new_order_data = array();
203
-			$count_data = count($data);
204
-			$count_column_show = count($column_show);
205
-			for ($j = 0; $j < $count_data; $j++) {
206
-				$k = 0;
207
-				for ($i = 0; $i < $count_column_show; $i++) {
208
-					if ($column_show[$i]) {
209
-						$new_order_data[$j][$k] = $data[$j][$i];
210
-					}
211
-					$k++;
212
-				}
213
-			}
214
-			// Replace the multi-arrays
215
-			$data = $new_order_data;
216
-		}
201
+            // We show only the columns data that were set up on the $column_show array
202
+            $new_order_data = array();
203
+            $count_data = count($data);
204
+            $count_column_show = count($column_show);
205
+            for ($j = 0; $j < $count_data; $j++) {
206
+                $k = 0;
207
+                for ($i = 0; $i < $count_column_show; $i++) {
208
+                    if ($column_show[$i]) {
209
+                        $new_order_data[$j][$k] = $data[$j][$i];
210
+                    }
211
+                    $k++;
212
+                }
213
+            }
214
+            // Replace the multi-arrays
215
+            $data = $new_order_data;
216
+        }
217 217
 
218
-		return $data;
219
-	}
218
+        return $data;
219
+    }
220 220
 
221
-	/**
222
-	 * Checks whether a column of a 2D-array contains only numeric values
223
-	 * @param array $data		The data-array
224
-	 * @param int $column		The index of the column to check
225
-	 * @return bool				TRUE if column contains only dates, FALSE otherwise
226
-	 * @todo Take locale into account (eg decimal point or comma ?)
227
-	 * @author [email protected]
228
-	 */
229
-	private static function is_numeric_column(& $data, $column)
221
+    /**
222
+     * Checks whether a column of a 2D-array contains only numeric values
223
+     * @param array $data		The data-array
224
+     * @param int $column		The index of the column to check
225
+     * @return bool				TRUE if column contains only dates, FALSE otherwise
226
+     * @todo Take locale into account (eg decimal point or comma ?)
227
+     * @author [email protected]
228
+     */
229
+    private static function is_numeric_column(& $data, $column)
230 230
     {
231
-		$is_numeric = true;
232
-		foreach ($data as $index => & $row) {
233
-			$is_numeric &= is_numeric(strip_tags($row[$column]));
234
-			if (!$is_numeric) {
235
-				break;
236
-			}
237
-		}
238
-		return $is_numeric;
239
-	}
231
+        $is_numeric = true;
232
+        foreach ($data as $index => & $row) {
233
+            $is_numeric &= is_numeric(strip_tags($row[$column]));
234
+            if (!$is_numeric) {
235
+                break;
236
+            }
237
+        }
238
+        return $is_numeric;
239
+    }
240 240
 
241
-	/**
242
-	 * Checks whether a column of a 2D-array contains only dates (GNU date syntax)
243
-	 * @param array $data		The data-array
244
-	 * @param int $column		The index of the column to check
245
-	 * @return bool				TRUE if column contains only dates, FALSE otherwise
246
-	 * @author [email protected]
247
-	 */
248
-	private static function is_date_column(& $data, $column)
241
+    /**
242
+     * Checks whether a column of a 2D-array contains only dates (GNU date syntax)
243
+     * @param array $data		The data-array
244
+     * @param int $column		The index of the column to check
245
+     * @return bool				TRUE if column contains only dates, FALSE otherwise
246
+     * @author [email protected]
247
+     */
248
+    private static function is_date_column(& $data, $column)
249 249
     {
250
-		$is_date = true;
251
-		foreach ($data as $index => & $row) {
252
-			if (strlen(strip_tags($row[$column])) != 0) {
253
-				$check_date = strtotime(strip_tags($row[$column]));
254
-				// strtotime Returns a timestamp on success, FALSE otherwise.
255
-				// Previous to PHP 5.1.0, this function would return -1 on failure.
256
-				$is_date &= ($check_date != -1 && $check_date);
257
-			} else {
258
-				$is_date &= false;
259
-			}
260
-			if (!$is_date) {
261
-				break;
262
-			}
263
-		}
264
-		return $is_date;
265
-	}
250
+        $is_date = true;
251
+        foreach ($data as $index => & $row) {
252
+            if (strlen(strip_tags($row[$column])) != 0) {
253
+                $check_date = strtotime(strip_tags($row[$column]));
254
+                // strtotime Returns a timestamp on success, FALSE otherwise.
255
+                // Previous to PHP 5.1.0, this function would return -1 on failure.
256
+                $is_date &= ($check_date != -1 && $check_date);
257
+            } else {
258
+                $is_date &= false;
259
+            }
260
+            if (!$is_date) {
261
+                break;
262
+            }
263
+        }
264
+        return $is_date;
265
+    }
266 266
 
267
-	/**
268
-	 * Checks whether a column of a 2D-array contains only images (<img src="path/file.ext" alt=".."/>)
269
-	 * @param array $data		The data-array
270
-	 * @param int $column		The index of the column to check
271
-	 * @return bool				TRUE if column contains only images, FALSE otherwise
272
-	 * @author [email protected]
273
-	 */
274
-	private static function is_image_column(& $data, $column)
267
+    /**
268
+     * Checks whether a column of a 2D-array contains only images (<img src="path/file.ext" alt=".."/>)
269
+     * @param array $data		The data-array
270
+     * @param int $column		The index of the column to check
271
+     * @return bool				TRUE if column contains only images, FALSE otherwise
272
+     * @author [email protected]
273
+     */
274
+    private static function is_image_column(& $data, $column)
275 275
     {
276
-		$is_image = true;
277
-		foreach ($data as $index => & $row) {
278
-			$is_image &= strlen(trim(strip_tags($row[$column], '<img>'))) > 0; // at least one img-tag
279
-			$is_image &= strlen(trim(strip_tags($row[$column]))) == 0; // and no text outside attribute-values
280
-			if (!$is_image) {
281
-				break;
282
-			}
283
-		}
284
-		return $is_image;
285
-	}
276
+        $is_image = true;
277
+        foreach ($data as $index => & $row) {
278
+            $is_image &= strlen(trim(strip_tags($row[$column], '<img>'))) > 0; // at least one img-tag
279
+            $is_image &= strlen(trim(strip_tags($row[$column]))) == 0; // and no text outside attribute-values
280
+            if (!$is_image) {
281
+                break;
282
+            }
283
+        }
284
+        return $is_image;
285
+    }
286 286
 }
Please login to merge, or discard this patch.
main/cron/lang/list_undefined_langvars.php 1 patch
Indentation   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -19,7 +19,7 @@  discard block
 block discarded – undo
19 19
     $file = $path.'/'.$entry;
20 20
     if (is_file($file)) {
21 21
         $terms = array_merge($terms,SubLanguageManager::get_all_language_variable_in_file($file,true));
22
-	}
22
+    }
23 23
 }
24 24
 // get only the array keys (the language variables defined in language files)
25 25
 $defined_terms = array_flip(array_keys($terms));
@@ -32,14 +32,14 @@  discard block
 block discarded – undo
32 32
 foreach ($files as $file) {
33 33
     //echo 'Analyzing '.$file."<br />";
34 34
     $shortfile = substr($file,$l);
35
-	$lines = file($file);
35
+    $lines = file($file);
36 36
     foreach ($lines as $line) {
37
-    	$myterms = array();
37
+        $myterms = array();
38 38
         $res = preg_match_all('/get_lang\(\'(\\w*)\'\)/',$line,$myterms);
39 39
         if ($res > 0) {
40 40
             foreach($myterms[1] as $term) {
41 41
                 if (!isset($defined_terms[$term]) && !isset($defined_terms['lang'.$term])) {
42
-                	$undefined_terms[$term] = $shortfile;
42
+                    $undefined_terms[$term] = $shortfile;
43 43
                     //echo "Undefined: $term<br />";
44 44
                 }
45 45
             }
@@ -49,7 +49,7 @@  discard block
 block discarded – undo
49 49
         if ($res > 0) {
50 50
             foreach($myterms[1] as $term) {
51 51
                 if (!isset($defined_terms[$term]) && !isset($defined_terms['lang'.$term])) {
52
-                	$undefined_terms[$term] = $shortfile;
52
+                    $undefined_terms[$term] = $shortfile;
53 53
                     //echo "Undefined: $term<br />";
54 54
                 }
55 55
             }
@@ -73,17 +73,17 @@  discard block
 block discarded – undo
73 73
     $list = scandir($base_path);
74 74
     $files = array();
75 75
     foreach ($list as $item) {
76
-    	if (substr($item,0,1)=='.') {continue;}
76
+        if (substr($item,0,1)=='.') {continue;}
77 77
         $special_dirs = array(api_get_path(SYS_TEST_PATH),api_get_path(SYS_COURSE_PATH),api_get_path(SYS_LANG_PATH),api_get_path(SYS_ARCHIVE_PATH));
78 78
         if (in_array($base_path.$item.'/',$special_dirs)) {continue;}
79 79
         if (is_dir($base_path.$item)) {
80
-        	$files = array_merge($files,get_all_php_files($base_path.$item.'/'));
80
+            $files = array_merge($files,get_all_php_files($base_path.$item.'/'));
81 81
         } else {
82 82
             //only analyse php files
83 83
                 $sub = substr($item,-4);
84
-        	if ($sub == '.php' or $sub == '.tpl') {
84
+            if ($sub == '.php' or $sub == '.tpl') {
85 85
                     $files[] = $base_path.$item;
86
-        	}
86
+            }
87 87
         }
88 88
     }
89 89
     $list = null;
Please login to merge, or discard this patch.