Completed
Push — 1.11.x ( d4cbce...fbf9a8 )
by José
48:27
created
main/inc/lib/course_category.lib.php 1 patch
Spacing   +2 added lines, -4 removed lines patch added patch discarded remove patch
@@ -1048,11 +1048,9 @@
 block discarded – undo
1048 1048
     function getLimitArray()
1049 1049
     {
1050 1050
         $pageCurrent = isset($_REQUEST['pageCurrent']) ?
1051
-            intval($_GET['pageCurrent']) :
1052
-            1;
1051
+            intval($_GET['pageCurrent']) : 1;
1053 1052
         $pageLength = isset($_REQUEST['pageLength']) ?
1054
-            intval($_GET['pageLength']) :
1055
-            10;
1053
+            intval($_GET['pageLength']) : 10;
1056 1054
 
1057 1055
         return array(
1058 1056
             'start' => ($pageCurrent - 1) * $pageLength,
Please login to merge, or discard this patch.
main/work/view.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -2,7 +2,7 @@  discard block
 block discarded – undo
2 2
 /* For licensing terms, see /license.txt */
3 3
 
4 4
 require_once '../inc/global.inc.php';
5
-$current_course_tool  = TOOL_STUDENTPUBLICATION;
5
+$current_course_tool = TOOL_STUDENTPUBLICATION;
6 6
 
7 7
 require_once 'work.lib.php';
8 8
 
@@ -52,7 +52,7 @@  discard block
 block discarded – undo
52 52
     $userInfo = api_get_user_info($work['user_id']);
53 53
     $interbreadcrumb[] = array('url' => $url_dir, 'name' => $my_folder_data['title']);
54 54
     $interbreadcrumb[] = array('url' => '#', 'name' => $userInfo['complete_name']);
55
-    $interbreadcrumb[] = array('url' => '#','name' => $work['title']);
55
+    $interbreadcrumb[] = array('url' => '#', 'name' => $work['title']);
56 56
 
57 57
     if (($courseInfo['show_score'] == 0 &&
58 58
         $work['active'] == 1 &&
Please login to merge, or discard this patch.
main/work/work.php 1 patch
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -8,7 +8,7 @@  discard block
 block discarded – undo
8 8
 use ChamiloSession as Session;
9 9
 
10 10
 require_once '../inc/global.inc.php';
11
-$current_course_tool  = TOOL_STUDENTPUBLICATION;
11
+$current_course_tool = TOOL_STUDENTPUBLICATION;
12 12
 
13 13
 api_protect_course_script(true);
14 14
 
@@ -39,7 +39,7 @@  discard block
 block discarded – undo
39 39
 $item_id = isset($_REQUEST['item_id']) ? intval($_REQUEST['item_id']) : null;
40 40
 $origin = isset($_REQUEST['origin']) ? Security::remove_XSS($_REQUEST['origin']) : '';
41 41
 $course_dir = api_get_path(SYS_COURSE_PATH).$_course['path'];
42
-$base_work_dir = $course_dir . '/work';
42
+$base_work_dir = $course_dir.'/work';
43 43
 $action = isset($_REQUEST['action']) ? $_REQUEST['action'] : 'list';
44 44
 
45 45
 //Download folder
@@ -76,7 +76,7 @@  discard block
 block discarded – undo
76 76
         'url' => api_get_path(WEB_CODE_PATH).'work/work.php?'.api_get_cidreq(),
77 77
         'name' => get_lang('StudentPublications'),
78 78
     );
79
-    $url_dir = api_get_path(WEB_CODE_PATH).'work/work.php?&id=' . $work_id.'&'.api_get_cidreq();
79
+    $url_dir = api_get_path(WEB_CODE_PATH).'work/work.php?&id='.$work_id.'&'.api_get_cidreq();
80 80
     if (!empty($my_folder_data)) {
81 81
         $interbreadcrumb[] = array('url' => $url_dir, 'name' =>  $my_folder_data['title']);
82 82
     }
@@ -119,7 +119,7 @@  discard block
 block discarded – undo
119 119
             $interbreadcrumb[] = array('url' => '#', 'name' => get_lang('EditToolOptions'));
120 120
         }
121 121
         if ($action == 'create_dir') {
122
-            $interbreadcrumb[] = array('url' => '#','name' => get_lang('CreateAssignment'));
122
+            $interbreadcrumb[] = array('url' => '#', 'name' => get_lang('CreateAssignment'));
123 123
         }
124 124
     }
125 125
 }
@@ -170,7 +170,7 @@  discard block
 block discarded – undo
170 170
         $form = new FormValidator(
171 171
             'form1',
172 172
             'post',
173
-            api_get_path(WEB_CODE_PATH) . 'work/work.php?action=create_dir&' . api_get_cidreq()
173
+            api_get_path(WEB_CODE_PATH).'work/work.php?action=create_dir&'.api_get_cidreq()
174 174
         );
175 175
         $form->addElement('header', get_lang('CreateAssignment'));
176 176
         $form->addElement('hidden', 'action', 'add');
@@ -207,7 +207,7 @@  discard block
 block discarded – undo
207 207
             $result = deleteDirWork($_REQUEST['id']);
208 208
             if ($result) {
209 209
                 $message = Display::return_message(
210
-                    get_lang('DirDeleted') . ': ' . $work_to_delete['title'],
210
+                    get_lang('DirDeleted').': '.$work_to_delete['title'],
211 211
                     'success'
212 212
                 );
213 213
                 Session::write('message', $message);
@@ -235,19 +235,19 @@  discard block
 block discarded – undo
235 235
         if ($is_allowed_to_edit) {
236 236
             $move_to_path = get_work_path($_REQUEST['move_to_id']);
237 237
 
238
-            if ($move_to_path==-1) {
238
+            if ($move_to_path == -1) {
239 239
                 $move_to_path = '/';
240 240
             } elseif (substr($move_to_path, -1, 1) != '/') {
241
-                $move_to_path = $move_to_path .'/';
241
+                $move_to_path = $move_to_path.'/';
242 242
             }
243 243
 
244 244
             // Security fix: make sure they can't move files that are not in the document table
245 245
             if ($path = get_work_path($item_id)) {
246
-                if (move($course_dir.'/'.$path, $base_work_dir . $move_to_path)) {
246
+                if (move($course_dir.'/'.$path, $base_work_dir.$move_to_path)) {
247 247
                     // Update db
248 248
                     updateWorkUrl(
249 249
                         $item_id,
250
-                        'work' . $move_to_path,
250
+                        'work'.$move_to_path,
251 251
                         $_REQUEST['move_to_id']
252 252
                     );
253 253
 
@@ -345,7 +345,7 @@  discard block
 block discarded – undo
345 345
             $content .= '</div>';
346 346
             $content .= '</div>';
347 347
             $content .= '<div id="student-list-work" style="display: none" class="table-responsive">';
348
-            $content .= '<div class="toolbar"><a id="closed-view-list" href="#"><em class="fa fa-times-circle"></em> ' .get_lang('Close'). '</a></div>';
348
+            $content .= '<div class="toolbar"><a id="closed-view-list" href="#"><em class="fa fa-times-circle"></em> '.get_lang('Close').'</a></div>';
349 349
             $content .= showStudentList($work_id);
350 350
             $content .= '</div>';
351 351
         } else {
Please login to merge, or discard this patch.
main/work/edit.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -4,7 +4,7 @@  discard block
 block discarded – undo
4 4
 use ChamiloSession as Session;
5 5
 
6 6
 require_once '../inc/global.inc.php';
7
-$current_course_tool  = TOOL_STUDENTPUBLICATION;
7
+$current_course_tool = TOOL_STUDENTPUBLICATION;
8 8
 
9 9
 api_protect_course_script(true);
10 10
 
@@ -50,7 +50,7 @@  discard block
 block discarded – undo
50 50
 $token = Security::get_token();
51 51
 
52 52
 $student_can_edit_in_session = api_is_allowed_to_session_edit(false, true);
53
-$has_ended   = false;
53
+$has_ended = false;
54 54
 $is_author = false;
55 55
 $work_item = get_work_data_by_id($item_id);
56 56
 
@@ -220,7 +220,7 @@  discard block
 block discarded – undo
220 220
 $form->setDefaults($defaults);
221 221
 $error_message = null;
222 222
 $_course = api_get_course_info();
223
-$currentCourseRepositorySys = api_get_path(SYS_COURSE_PATH).$_course['path'] . '/';
223
+$currentCourseRepositorySys = api_get_path(SYS_COURSE_PATH).$_course['path'].'/';
224 224
 
225 225
 $succeed = false;
226 226
 if ($form->validate()) {
@@ -241,7 +241,7 @@  discard block
 block discarded – undo
241 241
             $description = isset($_POST['description']) ? $_POST['description'] : $work_data['description'];
242 242
 
243 243
             $add_to_update = null;
244
-            if ($is_allowed_to_edit && ($_POST['qualification'] !='' )) {
244
+            if ($is_allowed_to_edit && ($_POST['qualification'] != '')) {
245 245
                 $add_to_update = ', qualificator_id ='."'".api_get_user_id()."', ";
246 246
                 $add_to_update .= ' qualification = '."'".Database::escape_string($_POST['qualification'])."',";
247 247
                 $add_to_update .= ' date_of_qualification = '."'".api_get_utc_datetime()."'";
@@ -267,7 +267,7 @@  discard block
 block discarded – undo
267 267
                     'error'
268 268
                 );
269 269
             } else {
270
-                $sql = "UPDATE  " . $work_table . "
270
+                $sql = "UPDATE  ".$work_table."
271 271
                         SET	title = '".Database::escape_string($title)."',
272 272
                             description = '".Database::escape_string($description)."'
273 273
                             ".$add_to_update."
Please login to merge, or discard this patch.
main/work/work_missing.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -2,7 +2,7 @@  discard block
 block discarded – undo
2 2
 /* For licensing terms, see /license.txt */
3 3
 
4 4
 require_once '../inc/global.inc.php';
5
-$current_course_tool  = TOOL_STUDENTPUBLICATION;
5
+$current_course_tool = TOOL_STUDENTPUBLICATION;
6 6
 
7 7
 /*	Configuration settings */
8 8
 
@@ -56,7 +56,7 @@  discard block
 block discarded – undo
56 56
 $token = Security::get_token();
57 57
 
58 58
 if (!empty($group_id)) {
59
-    $group_properties  = GroupManager::get_group_properties($group_id);
59
+    $group_properties = GroupManager::get_group_properties($group_id);
60 60
     $show_work = false;
61 61
 
62 62
     if (api_is_allowed_to_edit(false, true)) {
@@ -108,7 +108,7 @@  discard block
 block discarded – undo
108 108
 if (!empty($workId)) {
109 109
     if (empty($_GET['list']) or Security::remove_XSS($_GET['list']) == 'with') {
110 110
         $output .= '<a href="'.api_get_self().'?'.api_get_cidreq().'&id='.$workId.'&list=without">'.
111
-            Display::return_icon('exercice_uncheck.png', get_lang('ViewUsersWithoutTask'),'',ICON_SIZE_MEDIUM)."</a>";
111
+            Display::return_icon('exercice_uncheck.png', get_lang('ViewUsersWithoutTask'), '', ICON_SIZE_MEDIUM)."</a>";
112 112
     } else {
113 113
         if (!isset($_GET['action']) || (isset($_GET['action']) && $_GET['action'] != 'send_mail')) {
114 114
             $output .= '<a href="'.api_get_self().'?'.api_get_cidreq().'&id='.$workId.'&list=without&action=send_mail&sec_token='.$token.'">'.
Please login to merge, or discard this patch.
main/dropbox/dropbox_functions.inc.php 1 patch
Spacing   +30 added lines, -30 removed lines patch added patch discarded remove patch
@@ -41,7 +41,7 @@  discard block
 block discarded – undo
41 41
 
42 42
     // STEP 2: at least one file has to be selected. If not we return an error message
43 43
     $ids = isset($_GET['id']) ? $_GET['id'] : array();
44
-    if (count($ids)>0) {
44
+    if (count($ids) > 0) {
45 45
         $checked_file_ids = $_POST['id'];
46 46
     } else {
47 47
         foreach ($_POST as $key => $value) {
@@ -133,7 +133,7 @@  discard block
 block discarded – undo
133 133
     }
134 134
 
135 135
     $cat = get_dropbox_category($id);
136
-    if (count($cat)==0) {
136
+    if (count($cat) == 0) {
137 137
         return false;
138 138
     }
139 139
 
@@ -166,7 +166,7 @@  discard block
 block discarded – undo
166 166
             WHERE c_id = $course_id AND cat_id='".intval($id)."'";
167 167
     $result = Database::query($sql);
168 168
 
169
-    while($row = Database::fetch_array($result)) {
169
+    while ($row = Database::fetch_array($result)) {
170 170
         $dropboxfile = new Dropbox_Person($user_id, $is_courseAdmin, $is_courseTutor);
171 171
         if ($action == 'deletereceivedcategory') {
172 172
             $dropboxfile->deleteReceivedWork($row[$id_field]);
@@ -657,7 +657,7 @@  discard block
 block discarded – undo
657 657
 
658 658
                 $full_name = $userInfo['complete_name'].$groupNameListToString;
659 659
                 $current_user_id = $current_user['user_id'];
660
-                $options['user_' . $current_user_id] = $full_name;
660
+                $options['user_'.$current_user_id] = $full_name;
661 661
             }
662 662
         }
663 663
     }
@@ -706,11 +706,11 @@  discard block
 block discarded – undo
706 706
 
707 707
     $mailingId = $id - dropbox_cnf('mailingIdBase');
708 708
     if ($mailingId > 0) {
709
-        return get_lang('MailingAsUsername', '') . $mailingId;
709
+        return get_lang('MailingAsUsername', '').$mailingId;
710 710
     }
711 711
     $id = intval($id);
712 712
     $sql = "SELECT ".(api_is_western_name_order() ? "CONCAT(firstname,' ', lastname)" : "CONCAT(lastname,' ', firstname)")." AS name
713
-            FROM " . $dropbox_cnf['tbl_user'] . "
713
+            FROM " . $dropbox_cnf['tbl_user']."
714 714
             WHERE user_id='$id'";
715 715
     $result = Database::query($sql);
716 716
     $res = Database::fetch_array($result);
@@ -730,7 +730,7 @@  discard block
 block discarded – undo
730 730
 {
731 731
     $id = intval($id);
732 732
     $sql = "SELECT username
733
-            FROM " . dropbox_cnf('tbl_user') . "
733
+            FROM " . dropbox_cnf('tbl_user')."
734 734
             WHERE user_id='$id'";
735 735
     $result = Database::query($sql);
736 736
     $res = Database::fetch_array($result);
@@ -762,8 +762,8 @@  discard block
 block discarded – undo
762 762
 
763 763
     // select all files that aren't referenced anymore
764 764
     $sql = "SELECT DISTINCT f.id, f.filename
765
-            FROM " . dropbox_cnf('tbl_file') . " f
766
-            LEFT JOIN " . dropbox_cnf('tbl_person') . " p
765
+            FROM " . dropbox_cnf('tbl_file')." f
766
+            LEFT JOIN " . dropbox_cnf('tbl_person')." p
767 767
             ON (f.id = p.file_id)
768 768
             WHERE p.user_id IS NULL AND
769 769
                   f.c_id = $course_id
@@ -771,14 +771,14 @@  discard block
 block discarded – undo
771 771
     $result = Database::query($sql);
772 772
     while ($res = Database::fetch_array($result)) {
773 773
         //delete the selected files from the post and file tables
774
-        $sql = "DELETE FROM " . dropbox_cnf('tbl_post') . "
775
-                WHERE c_id = $course_id AND file_id = '" . $res['id'] . "'";
774
+        $sql = "DELETE FROM ".dropbox_cnf('tbl_post')."
775
+                WHERE c_id = $course_id AND file_id = '".$res['id']."'";
776 776
         Database::query($sql);
777
-        $sql = "DELETE FROM " . dropbox_cnf('tbl_file') . "
778
-                WHERE c_id = $course_id AND id ='" . $res['id'] . "'";
777
+        $sql = "DELETE FROM ".dropbox_cnf('tbl_file')."
778
+                WHERE c_id = $course_id AND id ='".$res['id']."'";
779 779
         Database::query($sql);
780 780
         //delete file from server
781
-        @unlink( dropbox_cnf('sysPath') . '/' . $res['filename']);
781
+        @unlink(dropbox_cnf('sysPath').'/'.$res['filename']);
782 782
     }
783 783
 }
784 784
 
@@ -801,11 +801,11 @@  discard block
 block discarded – undo
801 801
 
802 802
     $mailingPseudoId = intval($mailingPseudoId);
803 803
     $sql = "SELECT f.uploader_id
804
-            FROM " . $dropbox_cnf['tbl_file'] . " f
805
-            LEFT JOIN " . $dropbox_cnf['tbl_post'] . " p
804
+            FROM " . $dropbox_cnf['tbl_file']." f
805
+            LEFT JOIN " . $dropbox_cnf['tbl_post']." p
806 806
             ON (f.id = p.file_id AND f.c_id = $course_id AND p.c_id = $course_id)
807 807
             WHERE
808
-                p.dest_user_id = '" . $mailingPseudoId . "' AND
808
+                p.dest_user_id = '".$mailingPseudoId."' AND
809 809
                 p.c_id = $course_id
810 810
             ";
811 811
     $result = Database::query($sql);
@@ -832,20 +832,20 @@  discard block
 block discarded – undo
832 832
     //    for all content files, replace mailingPseudoId by owner as uploader
833 833
     $file_id = intval($file_id);
834 834
     $sql = "SELECT p.dest_user_id
835
-            FROM " . $dropbox_cnf['tbl_post'] . " p
836
-            WHERE c_id = $course_id AND p.file_id = '" . $file_id . "'";
835
+            FROM " . $dropbox_cnf['tbl_post']." p
836
+            WHERE c_id = $course_id AND p.file_id = '".$file_id."'";
837 837
     $result = Database::query($sql);
838 838
 
839 839
     if ($res = Database::fetch_array($result)) {
840 840
         $mailingPseudoId = $res['dest_user_id'];
841 841
         if ($mailingPseudoId > dropbox_cnf('mailingIdBase')) {
842
-            $sql = "DELETE FROM " . dropbox_cnf('tbl_person') . "
843
-                    WHERE c_id = $course_id AND user_id='" . $mailingPseudoId . "'";
842
+            $sql = "DELETE FROM ".dropbox_cnf('tbl_person')."
843
+                    WHERE c_id = $course_id AND user_id='".$mailingPseudoId."'";
844 844
             Database::query($sql);
845 845
 
846
-            $sql = "UPDATE " . dropbox_cnf('tbl_file') ."
847
-                    SET uploader_id='" . api_get_user_id() . "'
848
-                    WHERE c_id = $course_id AND uploader_id='" . $mailingPseudoId . "'";
846
+            $sql = "UPDATE ".dropbox_cnf('tbl_file')."
847
+                    SET uploader_id='" . api_get_user_id()."'
848
+                    WHERE c_id = $course_id AND uploader_id='".$mailingPseudoId."'";
849 849
             Database::query($sql);
850 850
         }
851 851
     }
@@ -984,7 +984,7 @@  discard block
 block discarded – undo
984 984
             }
985 985
         }
986 986
     } else {  // rename file to login_filename_uniqueId format
987
-        $dropbox_filename = getLoginFromId($_user['user_id']) . "_" . $dropbox_filename . "_".uniqid('');
987
+        $dropbox_filename = getLoginFromId($_user['user_id'])."_".$dropbox_filename."_".uniqid('');
988 988
     }
989 989
 
990 990
     // creating the array that contains all the users who will receive the file
@@ -1002,7 +1002,7 @@  discard block
 block discarded – undo
1002 1002
         }
1003 1003
     }
1004 1004
 
1005
-    @move_uploaded_file($dropbox_filetmpname, dropbox_cnf('sysPath') . '/' . $dropbox_filename);
1005
+    @move_uploaded_file($dropbox_filetmpname, dropbox_cnf('sysPath').'/'.$dropbox_filename);
1006 1006
 
1007 1007
     $b_send_mail = api_get_course_setting('email_alert_on_new_doc_dropbox');
1008 1008
 
@@ -1023,14 +1023,14 @@  discard block
 block discarded – undo
1023 1023
                 ),
1024 1024
                 $recipent_temp['email'],
1025 1025
                 get_lang('NewDropboxFileUploaded'),
1026
-                get_lang('NewDropboxFileUploadedContent').' <a href="'.api_get_path(WEB_CODE_PATH).'dropbox/index.php?' . api_get_cidreq() . '">'.get_lang('SeeFile').'</a>'.
1026
+                get_lang('NewDropboxFileUploadedContent').' <a href="'.api_get_path(WEB_CODE_PATH).'dropbox/index.php?'.api_get_cidreq().'">'.get_lang('SeeFile').'</a>'.
1027 1027
                 "\n\n".
1028 1028
                 api_get_person_name(
1029 1029
                     $_user['firstName'],
1030 1030
                     $_user['lastName'],
1031 1031
                     null,
1032 1032
                     PERSON_NAME_EMAIL_ADDRESS
1033
-                )."\n".  get_lang('Email') ." : ".$_user['mail'],
1033
+                )."\n".get_lang('Email')." : ".$_user['mail'],
1034 1034
                 api_get_person_name(
1035 1035
                     $_user['firstName'],
1036 1036
                     $_user['lastName'],
@@ -1308,7 +1308,7 @@  discard block
 block discarded – undo
1308 1308
         // Adding the content.
1309 1309
         $return .= "\n<tr>";
1310 1310
         foreach ($column as $column_key => $column_value) {
1311
-            if (!in_array($column_value,$dont_show_columns)) {
1311
+            if (!in_array($column_value, $dont_show_columns)) {
1312 1312
                 $return .= "\n\t<td>";
1313 1313
                 if (in_array($column_value, $make_link)) {
1314 1314
                     $return .= '<a href="'.$value[$column_value].'">'.$value[$column_value].'</a>';
@@ -1341,7 +1341,7 @@  discard block
 block discarded – undo
1341 1341
             WHERE c_id = $course_id GROUP BY file_id";
1342 1342
     $result = Database::query($sql);
1343 1343
     $return = array();
1344
-    while ($row=Database::fetch_array($result)) {
1344
+    while ($row = Database::fetch_array($result)) {
1345 1345
         $return[$row['file_id']] = $row['total'];
1346 1346
     }
1347 1347
     return $return;
Please login to merge, or discard this patch.
main/dropbox/recover_dropbox_files.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -33,7 +33,7 @@
 block discarded – undo
33 33
 $result = Database::query($sql);
34 34
 
35 35
 if (Database::num_rows($result)) {
36
-    $files  = Database::store_result($result);
36
+    $files = Database::store_result($result);
37 37
     $rows = array();
38 38
     foreach ($files as $file) {
39 39
         //Check if I have this file:
Please login to merge, or discard this patch.
main/dropbox/dropbox_init.inc.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -126,7 +126,7 @@  discard block
 block discarded – undo
126 126
 $is_courseTutor = api_is_course_tutor();
127 127
 $is_courseAdmin = api_is_course_admin();
128 128
 
129
-$current_course_tool  = TOOL_DROPBOX;
129
+$current_course_tool = TOOL_DROPBOX;
130 130
 
131 131
 // the dropbox configuration parameters
132 132
 $dropbox_cnf = require_once 'dropbox_config.inc.php';
@@ -278,10 +278,10 @@  discard block
 block discarded – undo
278 278
 $javascript .= "
279 279
 	</script>";
280 280
 $htmlHeadXtra[] = $javascript;
281
-$htmlHeadXtra[] ="<script>
281
+$htmlHeadXtra[] = "<script>
282 282
 function confirmation (name)
283 283
 {
284
-	if (confirm(\" ". get_lang("AreYouSureToDeleteJS") ." \"+ name + \" ?\"))
284
+	if (confirm(\" ". get_lang("AreYouSureToDeleteJS")." \"+ name + \" ?\"))
285 285
 		{return true;}
286 286
 	else
287 287
 		{return false;}
@@ -321,7 +321,7 @@  discard block
 block discarded – undo
321 321
 
322 322
 if ((!$is_allowed_in_course || !$is_course_member) && !api_is_allowed_to_edit(null, true)) {
323 323
     if ($origin != 'learnpath') {
324
-        api_not_allowed(true);//print headers/footers
324
+        api_not_allowed(true); //print headers/footers
325 325
     } else {
326 326
         api_not_allowed();
327 327
     }
Please login to merge, or discard this patch.
main/dropbox/index.php 1 patch
Spacing   +30 added lines, -30 removed lines patch added patch discarded remove patch
@@ -220,23 +220,23 @@  discard block
 block discarded – undo
220 220
 
221 221
 		if (api_get_session_id() == 0) {
222 222
 			echo '<div class="actions">';
223
-			if ($view_dropbox_category_received != 0  && api_is_allowed_to_session_edit(false, true)) {
224
-				echo '<a href="'.api_get_self().'?'.api_get_cidreq().'&view_received_category=0&view_sent_category='.$viewSentCategory.'&view='.$view.'">'.Display::return_icon('folder_up.png', get_lang('Up').' '.get_lang('Root'),'',ICON_SIZE_MEDIUM)."</a>";
223
+			if ($view_dropbox_category_received != 0 && api_is_allowed_to_session_edit(false, true)) {
224
+				echo '<a href="'.api_get_self().'?'.api_get_cidreq().'&view_received_category=0&view_sent_category='.$viewSentCategory.'&view='.$view.'">'.Display::return_icon('folder_up.png', get_lang('Up').' '.get_lang('Root'), '', ICON_SIZE_MEDIUM)."</a>";
225 225
 				echo get_lang('Category').': <strong>'.Security::remove_XSS($dropbox_categories[$view_dropbox_category_received]['cat_name']).'</strong> ';
226 226
 				$movelist[0] = 'Root'; // move_received selectbox content
227 227
 			} else {
228
-				echo '<a href="'.api_get_self().'?'.api_get_cidreq().'&action=addreceivedcategory&view='.$view.'">'.Display::return_icon('new_folder.png', get_lang('AddNewCategory'),'',ICON_SIZE_MEDIUM).'</a>';
228
+				echo '<a href="'.api_get_self().'?'.api_get_cidreq().'&action=addreceivedcategory&view='.$view.'">'.Display::return_icon('new_folder.png', get_lang('AddNewCategory'), '', ICON_SIZE_MEDIUM).'</a>';
229 229
 			}
230 230
 			echo '</div>';
231 231
 		} else {
232 232
 			if (api_is_allowed_to_session_edit(false, true)) {
233 233
 				echo '<div class="actions">';
234 234
 				if ($view_dropbox_category_received != 0 && api_is_allowed_to_session_edit(false, true)) {
235
-					echo '<a href="'.api_get_self().'?'.api_get_cidreq().'&view_received_category=0&view_sent_category='.$viewSentCategory.'&view='.$view.'">'.Display::return_icon('folder_up.png', get_lang('Up').' '.get_lang('Root'),'',ICON_SIZE_MEDIUM)."</a>";
235
+					echo '<a href="'.api_get_self().'?'.api_get_cidreq().'&view_received_category=0&view_sent_category='.$viewSentCategory.'&view='.$view.'">'.Display::return_icon('folder_up.png', get_lang('Up').' '.get_lang('Root'), '', ICON_SIZE_MEDIUM)."</a>";
236 236
 					echo get_lang('Category').': <strong>'.Security::remove_XSS($dropbox_categories[$view_dropbox_category_received]['cat_name']).'</strong> ';
237 237
 					$movelist[0] = 'Root'; // move_received selectbox content
238 238
 				} else {
239
-					echo '<a href="'.api_get_self().'?'.api_get_cidreq().'&action=addreceivedcategory&view='.$view.'">'.Display::return_icon('new_folder.png', get_lang('AddNewCategory'),'',ICON_SIZE_MEDIUM).'</a>';
239
+					echo '<a href="'.api_get_self().'?'.api_get_cidreq().'&action=addreceivedcategory&view='.$view.'">'.Display::return_icon('new_folder.png', get_lang('AddNewCategory'), '', ICON_SIZE_MEDIUM).'</a>';
240 240
 				}
241 241
 				echo '</div>';
242 242
 			}
@@ -256,13 +256,13 @@  discard block
 block discarded – undo
256 256
 		if (api_get_session_id() == 0) {
257 257
 			echo '<div class="actions">';
258 258
 			if ($view_dropbox_category_sent != 0) {
259
-				echo '<a href="'.api_get_self().'?'.api_get_cidreq().'&view_received_category='.$viewReceivedCategory.'&view_sent_category=0&view='.$view.'">'.Display::return_icon('folder_up.png', get_lang('Up').' '.get_lang('Root'),'',ICON_SIZE_MEDIUM)."</a>";
259
+				echo '<a href="'.api_get_self().'?'.api_get_cidreq().'&view_received_category='.$viewReceivedCategory.'&view_sent_category=0&view='.$view.'">'.Display::return_icon('folder_up.png', get_lang('Up').' '.get_lang('Root'), '', ICON_SIZE_MEDIUM)."</a>";
260 260
 				echo get_lang('Category').': <strong>'.Security::remove_XSS($dropbox_categories[$view_dropbox_category_sent]['cat_name']).'</strong> ';
261 261
 			} else {
262
-				echo "<a href=\"".api_get_self()."?".api_get_cidreq()."&view=".$view."&action=addsentcategory\">".Display::return_icon('new_folder.png', get_lang('AddNewCategory'),'',ICON_SIZE_MEDIUM)."</a>\n";
262
+				echo "<a href=\"".api_get_self()."?".api_get_cidreq()."&view=".$view."&action=addsentcategory\">".Display::return_icon('new_folder.png', get_lang('AddNewCategory'), '', ICON_SIZE_MEDIUM)."</a>\n";
263 263
 			}
264 264
 			if (empty($viewSentCategory)) {
265
-				echo "<a href=\"".api_get_self()."?".api_get_cidreq()."&view=".$view."&action=add\">".Display::return_icon('upload_file.png', get_lang('UploadNewFile'),'',ICON_SIZE_MEDIUM)."</a>";
265
+				echo "<a href=\"".api_get_self()."?".api_get_cidreq()."&view=".$view."&action=add\">".Display::return_icon('upload_file.png', get_lang('UploadNewFile'), '', ICON_SIZE_MEDIUM)."</a>";
266 266
 			}
267 267
 			echo '</div>';
268 268
 		} else {
@@ -270,12 +270,12 @@  discard block
 block discarded – undo
270 270
 				echo '<div class="actions">';
271 271
 				if ($view_dropbox_category_sent != 0) {
272 272
 					echo get_lang('CurrentlySeeing').': <strong>'.Security::remove_XSS($dropbox_categories[$view_dropbox_category_sent]['cat_name']).'</strong> ';
273
-					echo '<a href="'.api_get_self().'?'.api_get_cidreq().'&view_received_category='.$viewReceivedCategory.'&view_sent_category=0&view='.$view.'">'.Display::return_icon('folder_up.png', get_lang('Up').' '.get_lang('Root'),'',ICON_SIZE_MEDIUM)."</a>";
273
+					echo '<a href="'.api_get_self().'?'.api_get_cidreq().'&view_received_category='.$viewReceivedCategory.'&view_sent_category=0&view='.$view.'">'.Display::return_icon('folder_up.png', get_lang('Up').' '.get_lang('Root'), '', ICON_SIZE_MEDIUM)."</a>";
274 274
 				} else {
275
-					echo "<a href=\"".api_get_self()."?".api_get_cidreq()."&view=".$view."&action=addsentcategory\">".Display::return_icon('new_folder.png', get_lang('AddNewCategory'),'',ICON_SIZE_MEDIUM)."</a>\n";
275
+					echo "<a href=\"".api_get_self()."?".api_get_cidreq()."&view=".$view."&action=addsentcategory\">".Display::return_icon('new_folder.png', get_lang('AddNewCategory'), '', ICON_SIZE_MEDIUM)."</a>\n";
276 276
 				}
277 277
 				if (empty($viewSentCategory)) {
278
-					echo "<a href=\"".api_get_self()."?".api_get_cidreq()."&view=".$view."&action=add\">".Display::return_icon('upload_file.png', get_lang('UploadNewFile'),'',ICON_SIZE_MEDIUM)."</a>";
278
+					echo "<a href=\"".api_get_self()."?".api_get_cidreq()."&view=".$view."&action=add\">".Display::return_icon('upload_file.png', get_lang('UploadNewFile'), '', ICON_SIZE_MEDIUM)."</a>";
279 279
 				}
280 280
 				echo '</div>';
281 281
 			}
@@ -328,7 +328,7 @@  discard block
 block discarded – undo
328 328
 
329 329
 		if (api_get_session_id() == 0) {
330 330
 			$column_header[] = array(get_lang('Modify'), false, '', 'nowrap style="text-align: right"');
331
-		} elseif (api_is_allowed_to_session_edit(false,true)) {
331
+		} elseif (api_is_allowed_to_session_edit(false, true)) {
332 332
 			$column_header[] = array(get_lang('Modify'), false, '', 'nowrap style="text-align: right"');
333 333
 		}
334 334
 
@@ -373,13 +373,13 @@  discard block
 block discarded – undo
373 373
 				if ($dropbox_file->last_upload_date > $last_access &&
374 374
                     !in_array($dropbox_file->id, $_SESSION['_seen'][$_course['id']][TOOL_DROPBOX])
375 375
                 ) {
376
-					$new_icon = '&nbsp;'.Display::return_icon('new_dropbox_message.png', get_lang('New'),'',ICON_SIZE_SMALL);
376
+					$new_icon = '&nbsp;'.Display::return_icon('new_dropbox_message.png', get_lang('New'), '', ICON_SIZE_SMALL);
377 377
 				}
378 378
 
379 379
 				$link_open = '<a href="'.api_get_path(WEB_CODE_PATH).'dropbox/dropbox_download.php?'.api_get_cidreq().'&id='.$dropbox_file->id.'">';
380 380
 				$dropbox_file_data[] = $link_open.DocumentManager::build_document_icon_tag('file', $dropbox_file->title).'</a>';
381 381
 				$dropbox_file_data[] = '<a href="'.api_get_path(WEB_CODE_PATH).'dropbox/dropbox_download.php?'.api_get_cidreq().'&id='.$dropbox_file->id.'&action=download">'.
382
-                    Display::return_icon('save.png', get_lang('Download'), array('style' => 'float:right;'),ICON_SIZE_SMALL).'</a>'.$link_open.$dropbox_file->title.'</a>'.$new_icon.'<br />'.$dropbox_file->description;
382
+                    Display::return_icon('save.png', get_lang('Download'), array('style' => 'float:right;'), ICON_SIZE_SMALL).'</a>'.$link_open.$dropbox_file->title.'</a>'.$new_icon.'<br />'.$dropbox_file->description;
383 383
 				$file_size = $dropbox_file->filesize;
384 384
 				$dropbox_file_data[] = format_file_size($file_size);
385 385
 				$dropbox_file_data[] = $dropbox_file->author;
@@ -389,10 +389,10 @@  discard block
 block discarded – undo
389 389
                     api_format_date($last_upload_date).'</span>';
390 390
 
391 391
 				$action_icons = check_number_feedback($dropbox_file->id, $number_feedback).' '.get_lang('Feedback').'
392
-                <a href="'.api_get_self().'?'.api_get_cidreq().'&view_received_category='.$viewReceivedCategory.'&view_sent_category='.$viewSentCategory.'&view='.$view.'&action=viewfeedback&id='.$dropbox_file->id.'&'.$sort_params.'">'.Display::return_icon('discuss.png', get_lang('Comment'),'',ICON_SIZE_SMALL).'</a>
393
-                <a href="'.api_get_self().'?'.api_get_cidreq().'&view_received_category='.$viewReceivedCategory.'&view_sent_category='.$viewSentCategory.'&view='.$view.'&action=movereceived&move_id='.$dropbox_file->id.'&'.$sort_params.'">'.Display::return_icon('move.png', get_lang('Move'),'',ICON_SIZE_SMALL).'</a>
392
+                <a href="'.api_get_self().'?'.api_get_cidreq().'&view_received_category='.$viewReceivedCategory.'&view_sent_category='.$viewSentCategory.'&view='.$view.'&action=viewfeedback&id='.$dropbox_file->id.'&'.$sort_params.'">'.Display::return_icon('discuss.png', get_lang('Comment'), '', ICON_SIZE_SMALL).'</a>
393
+                <a href="'.api_get_self().'?'.api_get_cidreq().'&view_received_category='.$viewReceivedCategory.'&view_sent_category='.$viewSentCategory.'&view='.$view.'&action=movereceived&move_id='.$dropbox_file->id.'&'.$sort_params.'">'.Display::return_icon('move.png', get_lang('Move'), '', ICON_SIZE_SMALL).'</a>
394 394
                 <a href="'.api_get_self().'?'.api_get_cidreq().'&view_received_category='.$viewReceivedCategory.'&view_sent_category='.$viewSentCategory.'&view='.$view.'&action=deletereceivedfile&id='.$dropbox_file->id.'&'.$sort_params.'" onclick="javascript: return confirmation(\''.$dropbox_file->title.'\');">'.
395
-                Display::return_icon('delete.png', get_lang('Delete'),'',ICON_SIZE_SMALL).'</a>';
395
+                Display::return_icon('delete.png', get_lang('Delete'), '', ICON_SIZE_SMALL).'</a>';
396 396
 
397 397
 				// This is a hack to have an additional row in a sortable table
398 398
 
@@ -426,12 +426,12 @@  discard block
 block discarded – undo
426 426
 					// The icon of the category
427 427
 					$link_open = '<a href="'.api_get_self().'?'.api_get_cidreq().'&view_received_category='.$category['cat_id'].'&view_sent_category='.$viewSentCategory.'&view='.$view.'">';
428 428
 					$dropbox_category_data[] = $link_open.DocumentManager::build_document_icon_tag('folder', $category['cat_name']).'</a>';
429
-					$dropbox_category_data[] = '<a href="'.api_get_path(WEB_CODE_PATH).'dropbox/dropbox_download.php?'.api_get_cidreq().'&cat_id='.$category['cat_id'].'&action=downloadcategory&sent_received=received">'.Display::return_icon('save_pack.png', get_lang('Save'), array('style' => 'float:right;'),ICON_SIZE_SMALL).'</a>'.$link_open.$category['cat_name'].'</a>';
429
+					$dropbox_category_data[] = '<a href="'.api_get_path(WEB_CODE_PATH).'dropbox/dropbox_download.php?'.api_get_cidreq().'&cat_id='.$category['cat_id'].'&action=downloadcategory&sent_received=received">'.Display::return_icon('save_pack.png', get_lang('Save'), array('style' => 'float:right;'), ICON_SIZE_SMALL).'</a>'.$link_open.$category['cat_name'].'</a>';
430 430
 					$dropbox_category_data[] = '';
431 431
 					$dropbox_category_data[] = '';
432 432
 					$dropbox_category_data[] = '';
433
-					$dropbox_category_data[] = '<a href="'.api_get_self().'?'.api_get_cidreq().'&view_received_category='.$viewReceivedCategory.'&view_sent_category='.$viewSentCategory.'&view='.$view.'&action=editcategory&id='.$category['cat_id'].'">'.Display::return_icon('edit.png',get_lang('Edit'),'',ICON_SIZE_SMALL).'</a>
434
-										  <a href="'.api_get_self().'?'.api_get_cidreq().'&view_received_category='.$viewReceivedCategory.'&view_sent_category='.$viewSentCategory.'&view='.$view.'&action=deletereceivedcategory&id='.$category['cat_id'].'" onclick="javascript: return confirmation(\''.Security::remove_XSS($category['cat_name']).'\');">'.Display::return_icon('delete.png', get_lang('Delete'),'',ICON_SIZE_SMALL).'</a>';
433
+					$dropbox_category_data[] = '<a href="'.api_get_self().'?'.api_get_cidreq().'&view_received_category='.$viewReceivedCategory.'&view_sent_category='.$viewSentCategory.'&view='.$view.'&action=editcategory&id='.$category['cat_id'].'">'.Display::return_icon('edit.png', get_lang('Edit'), '', ICON_SIZE_SMALL).'</a>
434
+										  <a href="'.api_get_self().'?'.api_get_cidreq().'&view_received_category='.$viewReceivedCategory.'&view_sent_category='.$viewSentCategory.'&view='.$view.'&action=deletereceivedcategory&id='.$category['cat_id'].'" onclick="javascript: return confirmation(\''.Security::remove_XSS($category['cat_name']).'\');">'.Display::return_icon('delete.png', get_lang('Delete'), '', ICON_SIZE_SMALL).'</a>';
435 435
 				}
436 436
 				if (is_array($dropbox_category_data) && count($dropbox_category_data) > 0) {
437 437
 					$dropbox_data_recieved[] = $dropbox_category_data;
@@ -451,8 +451,8 @@  discard block
 block discarded – undo
451 451
         );
452 452
 
453 453
 		if (is_array($movelist)) {
454
-			foreach ($movelist as $catid => $catname){
455
-				$selectlist['move_received_'.$catid] = get_lang('Move') . '->'. Security::remove_XSS($catname);
454
+			foreach ($movelist as $catid => $catname) {
455
+				$selectlist['move_received_'.$catid] = get_lang('Move').'->'.Security::remove_XSS($catname);
456 456
 			}
457 457
 		}
458 458
 
@@ -546,7 +546,7 @@  discard block
 block discarded – undo
546 546
 				$link_open = '<a href="'.api_get_path(WEB_CODE_PATH).'dropbox/dropbox_download.php?'.api_get_cidreq().'&id='.$dropbox_file->id.'">';
547 547
 				$dropbox_file_data[] = $link_open.DocumentManager::build_document_icon_tag('file', $dropbox_file->title).'</a>';
548 548
 				$dropbox_file_data[] = '<a href="'.api_get_path(WEB_CODE_PATH).'dropbox/dropbox_download.php?'.api_get_cidreq().'&id='.$dropbox_file->id.'&action=download">'.
549
-                    Display::return_icon('save.png', get_lang('Save'), array('style' => 'float:right;'),ICON_SIZE_SMALL).'</a>'.$link_open.$dropbox_file->title.'</a><br />'.$dropbox_file->description;
549
+                    Display::return_icon('save.png', get_lang('Save'), array('style' => 'float:right;'), ICON_SIZE_SMALL).'</a>'.$link_open.$dropbox_file->title.'</a><br />'.$dropbox_file->description;
550 550
 				$file_size = $dropbox_file->filesize;
551 551
 				$dropbox_file_data[] = format_file_size($file_size);
552 552
                 $receivers_celldata = null;
@@ -563,9 +563,9 @@  discard block
 block discarded – undo
563 563
 				$receivers_celldata = '';
564 564
 
565 565
 				$action_icons = check_number_feedback($dropbox_file->id, $number_feedback).' '.get_lang('Feedback').'
566
-                    <a href="'.api_get_self().'?'.api_get_cidreq().'&view_received_category='.$viewReceivedCategory.'&view_sent_category='.$viewSentCategory.'&view='.$view.'&action=viewfeedback&id='.$dropbox_file->id.'&'.$sort_params.'">'.Display::return_icon('discuss.png', get_lang('Comment'),'',ICON_SIZE_SMALL).'</a>
567
-                    <a href="'.api_get_self().'?'.api_get_cidreq().'&view_received_category='.$viewReceivedCategory.'&view_sent_category='.$viewSentCategory.'&view='.$view.'&action=movesent&move_id='.$dropbox_file->id.'&'.$sort_params.'">'.Display::return_icon('move.png', get_lang('Move'),'',ICON_SIZE_SMALL).'</a>
568
-                    <a href="'.api_get_self().'?'.api_get_cidreq().'&view_received_category='.$viewReceivedCategory.'&view_sent_category='.$viewSentCategory.'&view='.$view.'&action=deletesentfile&id='.$dropbox_file->id.'&'.$sort_params.'" onclick="javascript: return confirmation(\''.$dropbox_file->title.'\');">'.Display::return_icon('delete.png', get_lang('Delete'),'',ICON_SIZE_SMALL).'</a>';
566
+                    <a href="'.api_get_self().'?'.api_get_cidreq().'&view_received_category='.$viewReceivedCategory.'&view_sent_category='.$viewSentCategory.'&view='.$view.'&action=viewfeedback&id='.$dropbox_file->id.'&'.$sort_params.'">'.Display::return_icon('discuss.png', get_lang('Comment'), '', ICON_SIZE_SMALL).'</a>
567
+                    <a href="'.api_get_self().'?'.api_get_cidreq().'&view_received_category='.$viewReceivedCategory.'&view_sent_category='.$viewSentCategory.'&view='.$view.'&action=movesent&move_id='.$dropbox_file->id.'&'.$sort_params.'">'.Display::return_icon('move.png', get_lang('Move'), '', ICON_SIZE_SMALL).'</a>
568
+                    <a href="'.api_get_self().'?'.api_get_cidreq().'&view_received_category='.$viewReceivedCategory.'&view_sent_category='.$viewSentCategory.'&view='.$view.'&action=deletesentfile&id='.$dropbox_file->id.'&'.$sort_params.'" onclick="javascript: return confirmation(\''.$dropbox_file->title.'\');">'.Display::return_icon('delete.png', get_lang('Delete'), '', ICON_SIZE_SMALL).'</a>';
569 569
 				// This is a hack to have an additional row in a sortable table
570 570
 				if ($action == 'viewfeedback' && isset($_GET['id']) && is_numeric($_GET['id']) && $dropbox_file->id == $_GET['id']) {
571 571
 					$action_icons .= "</td></tr>\n"; // ending the normal row of the sortable table
@@ -594,16 +594,16 @@  discard block
 block discarded – undo
594 594
 					// This is where the checkbox icon for the files appear.
595 595
 					$link_open = '<a href="'.api_get_self().'?'.api_get_cidreq().'&view_received_category='.$viewReceivedCategory.'&view_sent_category='.$category['cat_id'].'&view='.$view.'">';
596 596
 					$dropbox_category_data[] = $link_open.DocumentManager::build_document_icon_tag('folder', Security::remove_XSS($category['cat_name'])).'</a>';
597
-					$dropbox_category_data[] = '<a href="'.api_get_path(WEB_CODE_PATH).'dropbox/dropbox_download.php?'.api_get_cidreq().'&cat_id='.$category['cat_id'].'&action=downloadcategory&sent_received=sent">'.Display::return_icon('save_pack.png', get_lang('Save'), array('style' => 'float:right;'),ICON_SIZE_SMALL).'</a>'.$link_open.Security::remove_XSS($category['cat_name']).'</a>';
597
+					$dropbox_category_data[] = '<a href="'.api_get_path(WEB_CODE_PATH).'dropbox/dropbox_download.php?'.api_get_cidreq().'&cat_id='.$category['cat_id'].'&action=downloadcategory&sent_received=sent">'.Display::return_icon('save_pack.png', get_lang('Save'), array('style' => 'float:right;'), ICON_SIZE_SMALL).'</a>'.$link_open.Security::remove_XSS($category['cat_name']).'</a>';
598 598
 					//$dropbox_category_data[] = '';
599 599
 					$dropbox_category_data[] = '';
600 600
 					//$dropbox_category_data[] = '';
601 601
 					$dropbox_category_data[] = '';
602 602
 					$dropbox_category_data[] = '';
603 603
 					$dropbox_category_data[] = '<a href="'.api_get_self().'?'.api_get_cidreq().'&view_received_category='.$viewReceivedCategory.'&view_sent_category='.$viewSentCategory.'&view='.$view.'&action=editcategory&id='.$category['cat_id'].'">'.
604
-                                    Display::return_icon('edit.png', get_lang('Edit'),'',ICON_SIZE_SMALL).'</a>
604
+                                    Display::return_icon('edit.png', get_lang('Edit'), '', ICON_SIZE_SMALL).'</a>
605 605
 									<a href="'.api_get_self().'?'.api_get_cidreq().'&view_received_category='.$viewReceivedCategory.'&view_sent_category='.$viewSentCategory.'&view='.$view.'&action=deletesentcategory&id='.$category['cat_id'].'" onclick="javascript: return confirmation(\''.Security::remove_XSS($category['cat_name']).'\');">'.
606
-                                    Display::return_icon('delete.png', get_lang('Delete'),'',ICON_SIZE_SMALL).'</a>';
606
+                                    Display::return_icon('delete.png', get_lang('Delete'), '', ICON_SIZE_SMALL).'</a>';
607 607
 				}
608 608
 				if (is_array($dropbox_category_data) && count($dropbox_category_data) > 0) {
609 609
 					$dropbox_data_sent[] = $dropbox_category_data;
@@ -625,7 +625,7 @@  discard block
 block discarded – undo
625 625
 
626 626
         if (!empty($moveList)) {
627 627
             foreach ($moveList as $catid => $catname) {
628
-                $selectlist['move_sent_'.$catid] = get_lang('Move') . '->'. Security::remove_XSS($catname);
628
+                $selectlist['move_sent_'.$catid] = get_lang('Move').'->'.Security::remove_XSS($catname);
629 629
             }
630 630
         }
631 631
 
Please login to merge, or discard this patch.