Completed
Push — 1.11.x ( 6904fa...6a92e6 )
by José
525:44 queued 484:20
created
main/cron/document/index_all_docs.php 1 patch
Indentation   +16 added lines, -16 removed lines patch added patch discarded remove patch
@@ -8,9 +8,9 @@  discard block
 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\n";
11
+    echo "To add a document name to search, add ?doc=abc to the URL\n";
12 12
 } else {
13
-  echo "Received param ".$_GET['doc']."<br />\n";
13
+    echo "Received param ".$_GET['doc']."<br />\n";
14 14
 }
15 15
 $allowed_mime_types = DocumentManager::file_get_mime_type(true);
16 16
 $allowed_extensions = array(
@@ -40,30 +40,30 @@  discard block
 block discarded – undo
40 40
 $specific_fields = get_specific_field_list();
41 41
 $specific_fields_values = array();
42 42
 foreach ($specific_fields as $sf) {
43
-	$specific_fields_values[$sf['code']] = '';
43
+    $specific_fields_values[$sf['code']] = '';
44 44
 }
45 45
 $td = Database::get_course_table(TABLE_DOCUMENT);
46 46
 
47 47
 foreach ($courses_list as $course) {
48
-  $course_dir = $course['directory'].'/document';
49
-  $title = Database::escape_string($_GET['doc']);
50
-  $sql = "SELECT id, path, session_id FROM $td WHERE c_id = ".$course['id']." AND path LIKE '%$title%' or title LIKE '%$title%'";
51
-  $res = Database::query($sql);
52
-  if (Database::num_rows($res)>0) {
48
+    $course_dir = $course['directory'].'/document';
49
+    $title = Database::escape_string($_GET['doc']);
50
+    $sql = "SELECT id, path, session_id FROM $td WHERE c_id = ".$course['id']." AND path LIKE '%$title%' or title LIKE '%$title%'";
51
+    $res = Database::query($sql);
52
+    if (Database::num_rows($res)>0) {
53 53
     while ($row = Database::fetch_array($res)) {
54
-      $doc_path = api_get_path(SYS_COURSE_PATH).$course_dir.$row['path'];
55
-      $extensions = preg_split("/[\/\\.]/", $doc_path);
56
-      $doc_ext = strtolower($extensions[count($extensions) - 1]);
57
-      if (in_array($doc_ext, $allowed_extensions) && !is_dir($doc_path)) {
54
+        $doc_path = api_get_path(SYS_COURSE_PATH).$course_dir.$row['path'];
55
+        $extensions = preg_split("/[\/\\.]/", $doc_path);
56
+        $doc_ext = strtolower($extensions[count($extensions) - 1]);
57
+        if (in_array($doc_ext, $allowed_extensions) && !is_dir($doc_path)) {
58 58
         $doc_mime = mime_content_type($doc_path);
59 59
         echo "Indexing doc ".$row['id']." (".$row['path'].") in course ".$course['code']."\n";
60 60
         $residx = DocumentManager::index_document($row['id'], $course['code'], $row['session_id'], $course['course_language'], $specific_fields_values);
61 61
         if ($residx) {
62
-        	echo "Success\n";
62
+            echo "Success\n";
63 63
         } else {
64
-        	echo "Failure\n";
64
+            echo "Failure\n";
65 65
         }
66
-      }
66
+        }
67
+    }
67 68
     }
68
-  }
69 69
 }
Please login to merge, or discard this patch.
main/dashboard/dashboard.php 1 patch
Indentation   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -14,23 +14,23 @@  discard block
 block discarded – undo
14 14
 $views = array('blocks', 'list');
15 15
 
16 16
 if(isset($_GET['view']) && in_array($_GET['view'], $views)){
17
-	$dashboard_view = $_GET['view'];
17
+    $dashboard_view = $_GET['view'];
18 18
 }
19 19
 
20 20
 $link_blocks_view = $link_list_view = null;
21 21
 
22 22
 if (isset($dashboard_view) && $dashboard_view == 'list') {
23
-	$link_blocks_view = '<a href="'.api_get_self().'?view=blocks">'.
24
-		Display::return_icon('blocks.png',get_lang('DashboardBlocks'),'',ICON_SIZE_MEDIUM).'</a>';
23
+    $link_blocks_view = '<a href="'.api_get_self().'?view=blocks">'.
24
+        Display::return_icon('blocks.png',get_lang('DashboardBlocks'),'',ICON_SIZE_MEDIUM).'</a>';
25 25
 } else {
26
-	$link_list_view = '<a href="'.api_get_self().'?view=list">'.
27
-		Display::return_icon('edit.png',get_lang('EditBlocks'),'',ICON_SIZE_MEDIUM).'</a>';
26
+    $link_list_view = '<a href="'.api_get_self().'?view=list">'.
27
+        Display::return_icon('edit.png',get_lang('EditBlocks'),'',ICON_SIZE_MEDIUM).'</a>';
28 28
 }
29 29
 
30 30
 $configuration_link = null;
31 31
 if (api_is_platform_admin()) {
32
-	$configuration_link = '<a href="'.api_get_path(WEB_CODE_PATH).'admin/settings.php?category=Plugins">'
33
-	.Display::return_icon('settings.png',get_lang('ConfigureDashboardPlugin'),'',ICON_SIZE_MEDIUM).'</a>';
32
+    $configuration_link = '<a href="'.api_get_path(WEB_CODE_PATH).'admin/settings.php?category=Plugins">'
33
+    .Display::return_icon('settings.png',get_lang('ConfigureDashboardPlugin'),'',ICON_SIZE_MEDIUM).'</a>';
34 34
 }
35 35
 
36 36
 echo '<div class="actions">';
@@ -87,10 +87,10 @@  discard block
 block discarded – undo
87 87
     }
88 88
 
89 89
 } else {
90
-	// block dashboard list
91
-	if (isset($success)) {
92
-		Display::display_confirmation_message(get_lang('BlocksHaveBeenUpdatedSuccessfully'));
93
-	}
94
-	$user_id = api_get_user_id();
95
-	DashboardManager::display_user_dashboard_list($user_id);
90
+    // block dashboard list
91
+    if (isset($success)) {
92
+        Display::display_confirmation_message(get_lang('BlocksHaveBeenUpdatedSuccessfully'));
93
+    }
94
+    $user_id = api_get_user_id();
95
+    DashboardManager::display_user_dashboard_list($user_id);
96 96
 }
Please login to merge, or discard this patch.
main/blog/download.php 1 patch
Indentation   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -33,18 +33,18 @@
 block discarded – undo
33 33
 $doc_url = str_replace('/..', '', $doc_url); //echo $doc_url;
34 34
 
35 35
 if (! isset($_course)) {
36
-	api_not_allowed(true);
36
+    api_not_allowed(true);
37 37
 }
38 38
 $full_file_name = api_get_path(SYS_COURSE_PATH).api_get_course_path().'/upload/blog/'.$doc_url;
39 39
 
40 40
 //if the rewrite rule asks for a directory, we redirect to the course view
41 41
 if (is_dir($full_file_name)) {
42
-	//remove last slash if present
43
-	while ($doc_url{$dul = strlen($doc_url)-1}=='/') $doc_url = substr($doc_url,0,$dul);
44
-	//create the path
45
-	$document_explorer = api_get_path(WEB_COURSE_PATH).api_get_course_path(); // home course path
46
-	//redirect
47
-	header('Location: '.$document_explorer);
42
+    //remove last slash if present
43
+    while ($doc_url{$dul = strlen($doc_url)-1}=='/') $doc_url = substr($doc_url,0,$dul);
44
+    //create the path
45
+    $document_explorer = api_get_path(WEB_COURSE_PATH).api_get_course_path(); // home course path
46
+    //redirect
47
+    header('Location: '.$document_explorer);
48 48
     exit;
49 49
 }
50 50
 
Please login to merge, or discard this patch.
main/gradebook/gradebook_display_certificate.php 1 patch
Indentation   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -162,17 +162,17 @@
 block discarded – undo
162 162
 
163 163
     if ($form->validate()) {
164 164
         $officialCode = $form->getSubmitValue('filter');
165
-         if ($officialCode == 'all') {
165
+            if ($officialCode == 'all') {
166 166
             $certificate_list = GradebookUtils::get_list_users_certificates($cat_id);
167 167
         } else {
168
-             $userList = UserManager::getUsersByOfficialCode($officialCode);
169
-             if (!empty($userList)) {
170
-                 $certificate_list = GradebookUtils::get_list_users_certificates(
171
-                     $cat_id,
172
-                     $userList
173
-                 );
174
-             }
175
-         }
168
+                $userList = UserManager::getUsersByOfficialCode($officialCode);
169
+                if (!empty($userList)) {
170
+                    $certificate_list = GradebookUtils::get_list_users_certificates(
171
+                        $cat_id,
172
+                        $userList
173
+                    );
174
+                }
175
+            }
176 176
     } else {
177 177
         $certificate_list = GradebookUtils::get_list_users_certificates($cat_id);
178 178
     }
Please login to merge, or discard this patch.
main/gradebook/lib/fe/displaygradebook.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -558,7 +558,7 @@
 block discarded – undo
558 558
                     $my_api_cidreq = 'cidReq=' . $my_category['course_code'];
559 559
                 }
560 560
                 if ($show_add_link && !$message_resource) {
561
-                   $actionsLeft .= '<a href="gradebook_add_eval.php?' . $my_api_cidreq . '&selectcat=' . $catobj->get_id() . '" >' .
561
+                    $actionsLeft .= '<a href="gradebook_add_eval.php?' . $my_api_cidreq . '&selectcat=' . $catobj->get_id() . '" >' .
562 562
                         Display::return_icon('new_evaluation.png', get_lang('NewEvaluation'), '', ICON_SIZE_MEDIUM) . '</a>';
563 563
                     $cats = Category :: load($selectcat);
564 564
 
Please login to merge, or discard this patch.
main/gradebook/lib/be/exerciselink.class.php 1 patch
Indentation   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -194,13 +194,13 @@  discard block
 block discarded – undo
194 194
         in exercice/exercice.php, look for note-query-exe-results marker*/
195 195
         $session_id = api_get_session_id();
196 196
         $courseId = $this->getCourseId();
197
-	    $exercise = new Exercise($courseId);
197
+        $exercise = new Exercise($courseId);
198 198
         $exercise->read($this->get_ref_id());
199 199
 
200 200
         if (!$this->is_hp) {
201 201
 
202
-		if ($exercise->exercise_was_added_in_lp == false) {
203
-			$sql = "SELECT * FROM $tblStats
202
+        if ($exercise->exercise_was_added_in_lp == false) {
203
+            $sql = "SELECT * FROM $tblStats
204 204
 			        WHERE
205 205
 			            exe_exo_id = ".intval($this->get_ref_id())." AND
206 206
 			            orig_lp_id = 0 AND
@@ -209,15 +209,15 @@  discard block
 block discarded – undo
209 209
 			            session_id = $session_id AND
210 210
                                     c_id = $courseId 
211 211
                                 ";
212
-		    } else {
213
-		        $lpId = null;
214
-		        if (!empty($exercise->lpList)) {
215
-		            // Taking only the first LP
216
-		            $lpId = current($exercise->lpList);
217
-		            $lpId = $lpId['lp_id'];
218
-		        }
219
-
220
-		        $sql = "SELECT * FROM $tblStats
212
+            } else {
213
+                $lpId = null;
214
+                if (!empty($exercise->lpList)) {
215
+                    // Taking only the first LP
216
+                    $lpId = current($exercise->lpList);
217
+                    $lpId = $lpId['lp_id'];
218
+                }
219
+
220
+                $sql = "SELECT * FROM $tblStats
221 221
 		                WHERE
222 222
 		                    exe_exo_id = ".intval($this->get_ref_id())." AND
223 223
 		                    orig_lp_id = $lpId AND
@@ -225,7 +225,7 @@  discard block
 block discarded – undo
225 225
 		                    session_id = $session_id AND
226 226
                                     c_id = $courseId 
227 227
                                 ";
228
-		    }
228
+            }
229 229
 
230 230
             if (!empty($stud_id) && $type != 'ranking') {
231 231
                 $sql .= " AND exe_user_id = $stud_id ";
Please login to merge, or discard this patch.
main/gradebook/lib/be/gradebookitem.class.php 1 patch
Indentation   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -8,16 +8,16 @@
 block discarded – undo
8 8
  */
9 9
 interface GradebookItem
10 10
 {
11
-	public function get_item_type();
12
-	public function get_id();
13
-	public function get_name();
14
-	public function get_description();
15
-	public function get_course_code();
16
-	public function get_weight();
17
-	public function get_date();
18
-	public function is_visible();
19
-	public function get_icon_name();
20
-	public function getStudentList();
21
-	public function setStudentList($list);
22
-	public function calc_score($stud_id = null, $type = null);
11
+    public function get_item_type();
12
+    public function get_id();
13
+    public function get_name();
14
+    public function get_description();
15
+    public function get_course_code();
16
+    public function get_weight();
17
+    public function get_date();
18
+    public function is_visible();
19
+    public function get_icon_name();
20
+    public function getStudentList();
21
+    public function setStudentList($list);
22
+    public function calc_score($stud_id = null, $type = null);
23 23
 }
Please login to merge, or discard this patch.
main/gradebook/lib/be/category.class.php 1 patch
Indentation   -2 removed lines patch added patch discarded remove patch
@@ -1571,7 +1571,6 @@  discard block
 block discarded – undo
1571 1571
      * @param string $course_code Course code (optional)
1572 1572
      * @param int    $session_id Session ID (optional)
1573 1573
      * @param bool   $order
1574
-
1575 1574
      * @return array Array of subcategories
1576 1575
      */
1577 1576
     public function get_subcategories($stud_id = null, $course_code = null, $session_id = null, $order = null)
@@ -1850,7 +1849,6 @@  discard block
 block discarded – undo
1850 1849
      * This function, locks a category , only one who can unlock it is
1851 1850
      * the platform administrator.
1852 1851
      * @param int locked 1 or unlocked 0
1853
-
1854 1852
      * @return bool
1855 1853
      * */
1856 1854
     public function lock($locked)
Please login to merge, or discard this patch.
main/admin/grade_models.php 1 patch
Indentation   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -80,7 +80,7 @@  discard block
 block discarded – undo
80 80
                         array('name'=>'name',           'index'=>'name',        'width'=>'80',   'align'=>'left'),
81 81
                         array('name'=>'description',    'index'=>'description', 'width'=>'500',  'align'=>'left','sortable'=>'false'),
82 82
                         array('name'=>'actions',        'index'=>'actions',     'width'=>'100',  'align'=>'left','formatter'=>'action_formatter','sortable'=>'false')
83
-                       );
83
+                        );
84 84
 //Autowidth
85 85
 $extra_params['autowidth'] = 'true';
86 86
 //height auto
@@ -89,8 +89,8 @@  discard block
 block discarded – undo
89 89
 //With this function we can add actions to the jgrid (edit, delete, etc)
90 90
 $action_links = 'function action_formatter(cellvalue, options, rowObject) {
91 91
                          return \'<a href="?action=edit&id=\'+options.rowId+\'">'.Display::return_icon('edit.png',get_lang('Edit'),'',ICON_SIZE_SMALL).'</a>'.
92
-                         '&nbsp;<a onclick="javascript:if(!confirm('."\'".addslashes(api_htmlentities(get_lang("ConfirmYourChoice"),ENT_QUOTES))."\'".')) return false;"  href="?sec_token='.$token.'&action=delete&id=\'+options.rowId+\'">'.Display::return_icon('delete.png',get_lang('Delete'),'',ICON_SIZE_SMALL).'</a>'.
93
-                         '\';
92
+                            '&nbsp;<a onclick="javascript:if(!confirm('."\'".addslashes(api_htmlentities(get_lang("ConfirmYourChoice"),ENT_QUOTES))."\'".')) return false;"  href="?sec_token='.$token.'&action=delete&id=\'+options.rowId+\'">'.Display::return_icon('delete.png',get_lang('Delete'),'',ICON_SIZE_SMALL).'</a>'.
93
+                            '\';
94 94
                  }';
95 95
 ?>
96 96
 <script>
Please login to merge, or discard this patch.