chamilo / chamilo-lms

main/dropbox/dropbox_download.php

Indentation +1 added lines, -1 removed lines

@@ -89,7 +89,7 @@
             'error'
         )
     );
-	exit;
+    exit;
 } else {
     /*      DOWNLOAD THE FILE */
     // the user is allowed to download the file

Spacing +7 added lines, -7 removed lines

@@ -32,8 +32,8 @@ 
     if ($_GET['sent_received'] == 'sent') {
         // here we also incorporate the person table to make sure that deleted sent documents are not included.
         $sql = "SELECT DISTINCT file.id, file.filename, file.title
-                FROM ". Database::get_course_table(TABLE_DROPBOX_FILE) ." file
-                INNER JOIN ". Database::get_course_table(TABLE_DROPBOX_PERSON) ." person
+                FROM ". Database::get_course_table(TABLE_DROPBOX_FILE)." file
+                INNER JOIN ". Database::get_course_table(TABLE_DROPBOX_PERSON)." person
                 ON (person.file_id=file.id AND file.c_id = $course_id AND person.c_id = $course_id)
                 WHERE
                     file.uploader_id = $user_id AND
@@ -43,14 +43,14 @@ 
 
     if ($_GET['sent_received'] == 'received') {
         $sql = "SELECT DISTINCT file.id, file.filename, file.title
-                FROM ". Database::get_course_table(TABLE_DROPBOX_FILE) ." file
-                INNER JOIN ". Database::get_course_table(TABLE_DROPBOX_PERSON) ." person
+                FROM ". Database::get_course_table(TABLE_DROPBOX_FILE)." file
+                INNER JOIN ". Database::get_course_table(TABLE_DROPBOX_PERSON)." person
                 ON (person.file_id=file.id AND file.c_id = $course_id AND person.c_id = $course_id)
                 INNER JOIN ".Database::get_course_table(TABLE_DROPBOX_POST)." post
                 ON (post.file_id = file.id AND post.c_id = $course_id AND file.c_id = $course_id)
                 WHERE
                     post.cat_id = ".intval($_GET['cat_id'])." AND
-                    post.dest_user_id = $user_id" ;
+                    post.dest_user_id = $user_id";
     }
     $files_to_download = array();
     $result = Database::query($sql);
@@ -97,9 +97,9 @@ 
 
     $work = new Dropbox_Work($_GET['id']);
 
-    $path = api_get_path(SYS_COURSE_PATH) . $_course['path'] . '/dropbox/' . $work -> filename; //path to file as stored on server
+    $path = api_get_path(SYS_COURSE_PATH).$_course['path'].'/dropbox/'.$work -> filename; //path to file as stored on server
 
-    if (!Security::check_abs_path($path, api_get_path(SYS_COURSE_PATH) . $_course['path'] . '/dropbox/')) {
+    if (!Security::check_abs_path($path, api_get_path(SYS_COURSE_PATH).$_course['path'].'/dropbox/')) {
         exit;
     }
     $file = $work->title;

main/dropbox/dropbox_functions.inc.php

Indentation +4 added lines, -4 removed lines

@@ -83,11 +83,11 @@
     if (strstr($_POST['action'], 'move_')) {
         // check move_received_n or move_sent_n command
         if (strstr($_POST['action'], 'received')) {
-              $part = 'received';
-              $to_cat_id = str_replace('move_received_', '', $_POST['action']);
+                $part = 'received';
+                $to_cat_id = str_replace('move_received_', '', $_POST['action']);
         } else {
-              $part = 'sent';
-              $to_cat_id = str_replace('move_sent_', '', $_POST['action']);
+                $part = 'sent';
+                $to_cat_id = str_replace('move_sent_', '', $_POST['action']);
         }
 
         foreach ($checked_file_ids as $value) {

Braces +9 added lines, -4 removed lines

@@ -750,10 +750,15 @@
             ";
     $result = Database::query($sql);
 
-    if (!($res = Database::fetch_array($result)))
-        die(get_lang('GeneralError').' (code 901)');
-    if ($owner == 0) return $res['uploader_id'];
-    if ($res['uploader_id'] == $owner) return true;
+    if (!($res = Database::fetch_array($result))) {
+            die(get_lang('GeneralError').' (code 901)');
+    }
+    if ($owner == 0) {
+        return $res['uploader_id'];
+    }
+    if ($res['uploader_id'] == $owner) {
+        return true;
+    }
     die(get_lang('GeneralError').' (code '.$or_die.')');
 }
 

Spacing +42 added lines, -42 removed lines

@@ -42,7 +42,7 @@ 
 
     // STEP 2: at least one file has to be selected. If not we return an error message
     $ids = isset($_GET['id']) ? $_GET['id'] : array();
-    if (count($ids)>0) {
+    if (count($ids) > 0) {
         $checked_file_ids = $_POST['id'];
     } else {
         foreach ($_POST as $key => $value) {
@@ -133,7 +133,7 @@ 
     }
 
     $cat = get_dropbox_category($id);
-    if (count($cat)==0) {
+    if (count($cat) == 0) {
         return false;
     }
 
@@ -157,7 +157,7 @@ 
     }
 
     // step 1: delete the category
-    $sql = "DELETE FROM ". Database::get_course_table(TABLE_DROPBOX_CATEGORY) ."
+    $sql = "DELETE FROM ".Database::get_course_table(TABLE_DROPBOX_CATEGORY)."
             WHERE c_id = $course_id AND cat_id='".intval($id)."' AND $sentreceived='1'";
     Database::query($sql);
 
@@ -235,7 +235,7 @@ 
             $return_message = get_lang('ReceivedFileMoved');
         }
         if ($part == 'sent') {
-            $sql = "UPDATE ". Database::get_course_table(TABLE_DROPBOX_FILE) ."
+            $sql = "UPDATE ".Database::get_course_table(TABLE_DROPBOX_FILE)."
                     SET cat_id = ".intval($target)."
                     WHERE
                         c_id = $course_id AND
@@ -270,7 +270,7 @@ 
     $session_id = api_get_session_id();
     $condition_session = api_get_session_condition($session_id);
 
-    $sql = "SELECT * FROM ". Database::get_course_table(TABLE_DROPBOX_CATEGORY) ."
+    $sql = "SELECT * FROM ".Database::get_course_table(TABLE_DROPBOX_CATEGORY)."
             WHERE c_id = $course_id AND user_id='".$_user['user_id']."' $condition_session";
 
     $result = Database::query($sql);
@@ -292,7 +292,7 @@ 
 {
     $course_id = api_get_course_int_id();
     if (empty($id) or $id != intval($id)) { return array(); }
-    $sql = "SELECT * FROM ". Database::get_course_table(TABLE_DROPBOX_CATEGORY) ."
+    $sql = "SELECT * FROM ".Database::get_course_table(TABLE_DROPBOX_CATEGORY)."
             WHERE c_id = $course_id AND cat_id='".$id."'";
     $res = Database::query($sql);
     if ($res === false) {
@@ -341,7 +341,7 @@ 
     if (!isset($_POST['edit_id'])) {
         $session_id = api_get_session_id();
         // step 3a, we check if the category doesn't already exist
-        $sql = "SELECT * FROM ". Database::get_course_table(TABLE_DROPBOX_CATEGORY) ."
+        $sql = "SELECT * FROM ".Database::get_course_table(TABLE_DROPBOX_CATEGORY)."
                 WHERE
                     c_id = $course_id AND
                     user_id='".$_user['user_id']."' AND
@@ -364,7 +364,7 @@ 
             ];
             $id = Database::insert(Database::get_course_table(TABLE_DROPBOX_CATEGORY), $params);
             if ($id) {
-                $sql = "UPDATE ". Database::get_course_table(TABLE_DROPBOX_CATEGORY) ." SET cat_id = iid WHERE iid = $id";
+                $sql = "UPDATE ".Database::get_course_table(TABLE_DROPBOX_CATEGORY)." SET cat_id = iid WHERE iid = $id";
                 Database::query($sql);
             }
 
@@ -413,7 +413,7 @@ 
 
     if (isset($id) && $id != '') {
         // retrieve the category we are editing
-        $sql = "SELECT * FROM ". Database::get_course_table(TABLE_DROPBOX_CATEGORY) ."
+        $sql = "SELECT * FROM ".Database::get_course_table(TABLE_DROPBOX_CATEGORY)."
                 WHERE c_id = $course_id AND cat_id = ".intval($id);
         $result = Database::query($sql);
         $row = Database::fetch_array($result);
@@ -602,7 +602,7 @@ 
 
                 $full_name = $userInfo['complete_name'].$groupNameListToString;
                 $current_user_id = $current_user['user_id'];
-                $options['user_' . $current_user_id] = $full_name;
+                $options['user_'.$current_user_id] = $full_name;
             }
         }
     }
@@ -702,8 +702,8 @@ 
 
     // select all files that aren't referenced anymore
     $sql = "SELECT DISTINCT f.id, f.filename
-            FROM " . Database::get_course_table(TABLE_DROPBOX_FILE) . " f
-            LEFT JOIN " . Database::get_course_table(TABLE_DROPBOX_PERSON) . " p
+            FROM " . Database::get_course_table(TABLE_DROPBOX_FILE)." f
+            LEFT JOIN " . Database::get_course_table(TABLE_DROPBOX_PERSON)." p
             ON (f.id = p.file_id)
             WHERE p.user_id IS NULL AND
                   f.c_id = $course_id
@@ -711,14 +711,14 @@ 
     $result = Database::query($sql);
     while ($res = Database::fetch_array($result)) {
         //delete the selected files from the post and file tables
-        $sql = "DELETE FROM " . Database::get_course_table(TABLE_DROPBOX_POST) . "
-                WHERE c_id = $course_id AND file_id = '" . $res['id'] . "'";
+        $sql = "DELETE FROM ".Database::get_course_table(TABLE_DROPBOX_POST)."
+                WHERE c_id = $course_id AND file_id = '".$res['id']."'";
         Database::query($sql);
-        $sql = "DELETE FROM " . Database::get_course_table(TABLE_DROPBOX_FILE) . "
-                WHERE c_id = $course_id AND id ='" . $res['id'] . "'";
+        $sql = "DELETE FROM ".Database::get_course_table(TABLE_DROPBOX_FILE)."
+                WHERE c_id = $course_id AND id ='".$res['id']."'";
         Database::query($sql);
         //delete file from server
-        @unlink( api_get_path(SYS_COURSE_PATH) . $_course['path'] . '/dropbox/' . $res['filename']);
+        @unlink(api_get_path(SYS_COURSE_PATH).$_course['path'].'/dropbox/'.$res['filename']);
     }
 }
 
@@ -740,11 +740,11 @@ 
 
     $mailingPseudoId = intval($mailingPseudoId);
     $sql = "SELECT f.uploader_id
-            FROM " . Database::get_course_table(TABLE_DROPBOX_FILE) . " f
-            LEFT JOIN " . Database::get_course_table(TABLE_DROPBOX_POST) . " p
+            FROM " . Database::get_course_table(TABLE_DROPBOX_FILE)." f
+            LEFT JOIN " . Database::get_course_table(TABLE_DROPBOX_POST)." p
             ON (f.id = p.file_id AND f.c_id = $course_id AND p.c_id = $course_id)
             WHERE
-                p.dest_user_id = '" . $mailingPseudoId . "' AND
+                p.dest_user_id = '".$mailingPseudoId."' AND
                 p.c_id = $course_id
             ";
     $result = Database::query($sql);
@@ -770,21 +770,21 @@ 
     //    for all content files, replace mailingPseudoId by owner as uploader
     $file_id = intval($file_id);
     $sql = "SELECT p.dest_user_id
-            FROM " . Database::get_course_table(TABLE_DROPBOX_POST) . " p
-            WHERE c_id = $course_id AND p.file_id = '" . $file_id . "'";
+            FROM " . Database::get_course_table(TABLE_DROPBOX_POST)." p
+            WHERE c_id = $course_id AND p.file_id = '".$file_id."'";
     $result = Database::query($sql);
 
     if ($res = Database::fetch_array($result)) {
         $mailingPseudoId = $res['dest_user_id'];
         $mailId = get_mail_id_base();
         if ($mailingPseudoId > $mailId) {
-            $sql = "DELETE FROM " . Database::get_course_table(TABLE_DROPBOX_PERSON) . "
-                    WHERE c_id = $course_id AND user_id='" . $mailingPseudoId . "'";
+            $sql = "DELETE FROM ".Database::get_course_table(TABLE_DROPBOX_PERSON)."
+                    WHERE c_id = $course_id AND user_id='".$mailingPseudoId."'";
             Database::query($sql);
 
-            $sql = "UPDATE " . Database::get_course_table(TABLE_DROPBOX_FILE) ."
-                    SET uploader_id='" . api_get_user_id() . "'
-                    WHERE c_id = $course_id AND uploader_id='" . $mailingPseudoId . "'";
+            $sql = "UPDATE ".Database::get_course_table(TABLE_DROPBOX_FILE)."
+                    SET uploader_id='" . api_get_user_id()."'
+                    WHERE c_id = $course_id AND uploader_id='".$mailingPseudoId."'";
             Database::query($sql);
         }
     }
@@ -925,7 +925,7 @@ 
             }
         }
     } else {  // rename file to login_filename_uniqueId format
-        $dropbox_filename = $_user['username'] . "_" . $dropbox_filename . "_".uniqid('');
+        $dropbox_filename = $_user['username']."_".$dropbox_filename."_".uniqid('');
     }
 
     // creating the array that contains all the users who will receive the file
@@ -944,7 +944,7 @@ 
         }
     }
 
-    @move_uploaded_file($dropbox_filetmpname, api_get_path(SYS_COURSE_PATH) . $_course['path'] . '/dropbox/' . $dropbox_filename);
+    @move_uploaded_file($dropbox_filetmpname, api_get_path(SYS_COURSE_PATH).$_course['path'].'/dropbox/'.$dropbox_filename);
 
     $b_send_mail = api_get_course_setting('email_alert_on_new_doc_dropbox');
 
@@ -965,14 +965,14 @@ 
                 ),
                 $recipent_temp['email'],
                 get_lang('NewDropboxFileUploaded'),
-                get_lang('NewDropboxFileUploadedContent').' <a href="'.api_get_path(WEB_CODE_PATH).'dropbox/index.php?' . api_get_cidreq() . '">'.get_lang('SeeFile').'</a>'.
+                get_lang('NewDropboxFileUploadedContent').' <a href="'.api_get_path(WEB_CODE_PATH).'dropbox/index.php?'.api_get_cidreq().'">'.get_lang('SeeFile').'</a>'.
                 "\n\n".
                 api_get_person_name(
                     $_user['firstName'],
                     $_user['lastName'],
                     null,
                     PERSON_NAME_EMAIL_ADDRESS
-                )."\n".  get_lang('Email') ." : ".$_user['mail'],
+                )."\n".get_lang('Email')." : ".$_user['mail'],
                 api_get_person_name(
                     $_user['firstName'],
                     $_user['lastName'],
@@ -1068,12 +1068,12 @@ 
     $id = intval($id);
     $user_id = intval($user_id);
 
-    $sql = "SELECT file_id FROM ". Database::get_course_table(TABLE_DROPBOX_PERSON) ."
+    $sql = "SELECT file_id FROM ".Database::get_course_table(TABLE_DROPBOX_PERSON)."
             WHERE c_id = $course_id AND user_id = $user_id AND file_id = ".$id;
     $result = Database::query($sql);
     $number_users_who_see_file = Database::num_rows($result);
 
-    $sql = "SELECT file_id FROM ". Database::get_course_table(TABLE_DROPBOX_POST) ."
+    $sql = "SELECT file_id FROM ".Database::get_course_table(TABLE_DROPBOX_POST)."
             WHERE c_id = $course_id AND dest_user_id = $user_id AND file_id = ".$id;
     $result = Database::query($sql);
     $count = Database::num_rows($result);
@@ -1087,12 +1087,12 @@ 
 {
     $id = intval($id);
     $course_id = api_get_course_int_id();
-    $sql = "SELECT file_id FROM ". Database::get_course_table(TABLE_DROPBOX_PERSON) ."
+    $sql = "SELECT file_id FROM ".Database::get_course_table(TABLE_DROPBOX_PERSON)."
             WHERE c_id = $course_id AND file_id = ".$id;
     $result = Database::query($sql);
     $number_users_who_see_file = Database::num_rows($result);
 
-    $sql = "SELECT file_id FROM ". Database::get_course_table(TABLE_DROPBOX_POST) ."
+    $sql = "SELECT file_id FROM ".Database::get_course_table(TABLE_DROPBOX_POST)."
             WHERE c_id = $course_id AND file_id = ".$id;
     $result = Database::query($sql);
     $count = Database::num_rows($result);
@@ -1124,7 +1124,7 @@ 
 
         $id = Database::insert(Database::get_course_table(TABLE_DROPBOX_FEEDBACK), $params);
         if ($id) {
-            $sql = "UPDATE ". Database::get_course_table(TABLE_DROPBOX_FEEDBACK) ." SET feedback_id = iid WHERE iid = $id";
+            $sql = "UPDATE ".Database::get_course_table(TABLE_DROPBOX_FEEDBACK)." SET feedback_id = iid WHERE iid = $id";
             Database::query($sql);
         }
 
@@ -1151,10 +1151,10 @@ 
 
     // note: we also have to add the check if the user has received or sent this file.
     $sql = "SELECT DISTINCT file.filename, file.title, file.author, file.description
-            FROM ". Database::get_course_table(TABLE_DROPBOX_FILE) ." file
-            INNER JOIN ". Database::get_course_table(TABLE_DROPBOX_PERSON) ." person
+            FROM ". Database::get_course_table(TABLE_DROPBOX_FILE)." file
+            INNER JOIN ". Database::get_course_table(TABLE_DROPBOX_PERSON)." person
             ON (person.file_id=file.id AND file.c_id = $course_id AND person.c_id = $course_id)
-            INNER JOIN ". Database::get_course_table(TABLE_DROPBOX_POST) ." post
+            INNER JOIN ".Database::get_course_table(TABLE_DROPBOX_POST)." post
             ON (post.file_id = file.id AND post.c_id = $course_id AND file.c_id = $course_id)
             WHERE
                 file.id IN (".implode(', ', $fileList).") AND
@@ -1248,7 +1248,7 @@ 
         // Adding the content.
         $return .= "\n<tr>";
         foreach ($column as $column_key => $column_value) {
-            if (!in_array($column_value,$dont_show_columns)) {
+            if (!in_array($column_value, $dont_show_columns)) {
                 $return .= "\n\t<td>";
                 if (in_array($column_value, $make_link)) {
                     $return .= '<a href="'.$value[$column_value].'">'.$value[$column_value].'</a>';
@@ -1276,11 +1276,11 @@ 
 {
     $course_id = api_get_course_int_id();
     $sql = "SELECT COUNT(feedback_id) AS total, file_id
-            FROM ". Database::get_course_table(TABLE_DROPBOX_FEEDBACK) ."
+            FROM ". Database::get_course_table(TABLE_DROPBOX_FEEDBACK)."
             WHERE c_id = $course_id GROUP BY file_id";
     $result = Database::query($sql);
     $return = array();
-    while ($row=Database::fetch_array($result)) {
+    while ($row = Database::fetch_array($result)) {
         $return[$row['file_id']] = $row['total'];
     }
     return $return;

main/course_progress/thematic_controller.php

Spacing +6 added lines, -6 removed lines

@@ -201,20 +201,20 @@ 
                         $plan_html = null;
                         if (!empty($data)) {
                             foreach ($data as $plan) {
-                                $plan_html .= '<strong>' . $plan['title'] . '</strong><br /> ' . $plan['description'] . '<br />';
+                                $plan_html .= '<strong>'.$plan['title'].'</strong><br /> '.$plan['description'].'<br />';
                             }
                         }
                         $data = $thematic->get_thematic_advance_by_thematic_id($theme['id']);
                         $advance_html = null;
                         if (!empty($data)) {
                             foreach ($data as $advance) {
-                                $advance_html .= api_convert_and_format_date($advance['start_date'], DATE_FORMAT_LONG) . ' ('.$advance['duration'].' '.get_lang('HourShort').')<br />'.$advance['content'].'<br />';
+                                $advance_html .= api_convert_and_format_date($advance['start_date'], DATE_FORMAT_LONG).' ('.$advance['duration'].' '.get_lang('HourShort').')<br />'.$advance['content'].'<br />';
                             }
                         }
                         $table[] = array($theme['title'], $plan_html, $advance_html);
                     }
                     $params = array(
-                        'filename' => get_lang('Thematic') . '-' . api_get_local_time(),
+                        'filename' => get_lang('Thematic').'-'.api_get_local_time(),
                         'pdf_title' => get_lang('Thematic'),
                         'add_signatures' => true,
                         'format' => 'A4-L',
@@ -311,9 +311,9 @@ 
                             unset($_SESSION['thematic_plan_token']);
                             $data['message'] = 'ok';
 
-                            $saveRedirect = api_get_path(WEB_PATH) . 'main/course_progress/index.php?';
-                            $saveRedirect.= api_get_cidreq() . '&';
-                            $saveRedirect.= 'thematic_plan_save_message=ok';
+                            $saveRedirect = api_get_path(WEB_PATH).'main/course_progress/index.php?';
+                            $saveRedirect .= api_get_cidreq().'&';
+                            $saveRedirect .= 'thematic_plan_save_message=ok';
 
                             header("Location: $saveRedirect");
                             exit;

main/course_progress/thematic.php

Spacing +34 added lines, -34 removed lines

@@ -23,25 +23,25 @@ 
         case 'thematic_add' :
         case 'thematic_import_select' :
             echo '<a href="index.php?'.api_get_cidreq().'">'.
-                Display::return_icon('back.png',get_lang('BackTo').' '.get_lang('ThematicDetails'),'',ICON_SIZE_MEDIUM).'</a>';
+                Display::return_icon('back.png', get_lang('BackTo').' '.get_lang('ThematicDetails'), '', ICON_SIZE_MEDIUM).'</a>';
             break;
         case 'thematic_list' :
             echo '<a href="index.php?'.api_get_cidreq().'&action=thematic_add'.$url_token.'">'.
-                Display::return_icon('new_course_progress.png',get_lang('NewThematicSection'),'',ICON_SIZE_MEDIUM).'</a>';
+                Display::return_icon('new_course_progress.png', get_lang('NewThematicSection'), '', ICON_SIZE_MEDIUM).'</a>';
             break;
         case 'thematic_details' :
             echo '<a href="index.php?'.api_get_cidreq().'&action=thematic_add'.$url_token.'">'.
-                Display::return_icon('new_course_progress.png',get_lang('NewThematicSection'),'',ICON_SIZE_MEDIUM).'</a>';
+                Display::return_icon('new_course_progress.png', get_lang('NewThematicSection'), '', ICON_SIZE_MEDIUM).'</a>';
             echo '<a href="index.php?'.api_get_cidreq().'&action=thematic_import_select'.$url_token.'">'.
-                Display::return_icon('import_csv.png',get_lang('ImportThematic'),'',ICON_SIZE_MEDIUM).'</a>';
+                Display::return_icon('import_csv.png', get_lang('ImportThematic'), '', ICON_SIZE_MEDIUM).'</a>';
             echo '<a href="index.php?'.api_get_cidreq().'&action=thematic_export'.$url_token.'">'.
-                Display::return_icon('export_csv.png',get_lang('ExportThematic'),'', ICON_SIZE_MEDIUM).'</a>';
+                Display::return_icon('export_csv.png', get_lang('ExportThematic'), '', ICON_SIZE_MEDIUM).'</a>';
             echo '<a href="index.php?'.api_get_cidreq().'&action=thematic_export_pdf'.$url_token.'">'.
-                Display::return_icon('pdf.png',get_lang('ExportToPDF'),'', ICON_SIZE_MEDIUM).'</a>';
+                Display::return_icon('pdf.png', get_lang('ExportToPDF'), '', ICON_SIZE_MEDIUM).'</a>';
             break;
         default :
             echo '<a href="index.php?'.api_get_cidreq().'&action=thematic_add'.$url_token.'">'.
-                Display::return_icon('new_course_progress.png',get_lang('NewThematicSection'),'',ICON_SIZE_MEDIUM).'</a>';
+                Display::return_icon('new_course_progress.png', get_lang('NewThematicSection'), '', ICON_SIZE_MEDIUM).'</a>';
     }
     echo '</div>';
 }
@@ -57,10 +57,10 @@ 
     $parameters['action'] = $action;
     $table->set_additional_parameters($parameters);
     $table->set_header(0, '', false, array('style'=>'width:20px;'));
-    $table->set_header(1, get_lang('Title'), false );
+    $table->set_header(1, get_lang('Title'), false);
     if (api_is_allowed_to_edit(null, true)) {
-        $table->set_header(2, get_lang('Actions'), false,array('style'=>'text-align:center;width:40%;'));
-        $table->set_form_actions(array ('thematic_delete_select' => get_lang('DeleteAllThematics')));
+        $table->set_header(2, get_lang('Actions'), false, array('style'=>'text-align:center;width:40%;'));
+        $table->set_form_actions(array('thematic_delete_select' => get_lang('DeleteAllThematics')));
     }
     $table->display();
 
@@ -72,11 +72,11 @@ 
 
     if (isset($last_id) && $last_id) {
         $link_to_thematic_plan = '<a href="index.php?'.api_get_cidreq().'&action=thematic_plan_list&thematic_id='.$last_id.'">'.
-            Display::return_icon('lesson_plan.png', get_lang('ThematicPlan'), array('style'=>'vertical-align:middle;float:none;'),ICON_SIZE_SMALL).'</a>';
+            Display::return_icon('lesson_plan.png', get_lang('ThematicPlan'), array('style'=>'vertical-align:middle;float:none;'), ICON_SIZE_SMALL).'</a>';
         $link_to_thematic_advance = '<a href="index.php?'.api_get_cidreq().'&action=thematic_advance_list&thematic_id='.$last_id.'">'.
-            Display::return_icon('lesson_plan_calendar.png', get_lang('ThematicAdvance'), array('style'=>'vertical-align:middle;float:none;'),ICON_SIZE_SMALL).'</a>';
+            Display::return_icon('lesson_plan_calendar.png', get_lang('ThematicAdvance'), array('style'=>'vertical-align:middle;float:none;'), ICON_SIZE_SMALL).'</a>';
         Display::display_confirmation_message(
-            get_lang('ThematicSectionHasBeenCreatedSuccessfull').'<br />'.sprintf(get_lang('NowYouShouldAddThematicPlanXAndThematicAdvanceX'),$link_to_thematic_plan, $link_to_thematic_advance),
+            get_lang('ThematicSectionHasBeenCreatedSuccessfull').'<br />'.sprintf(get_lang('NowYouShouldAddThematicPlanXAndThematicAdvanceX'), $link_to_thematic_plan, $link_to_thematic_advance),
             false
         );
     }
@@ -113,27 +113,27 @@ 
             $actions_first_col = '';
             if (api_is_allowed_to_edit(null, true)) {
                 // Thematic title
-                $actions_first_col  = Display::url(
+                $actions_first_col = Display::url(
                     Display::return_icon('cd.gif', get_lang('Copy')),
                     'index.php?'.api_get_cidreq().'&action=thematic_copy&thematic_id='.$my_thematic_id.$params.$url_token
                 );
-                if (api_get_session_id() == 0 ) {
+                if (api_get_session_id() == 0) {
 
                     if ($thematic['display_order'] > 1) {
-                        $actions_first_col .= ' <a href="'.api_get_self().'?action=moveup&'.api_get_cidreq().'&thematic_id='.$my_thematic_id.$params.$url_token.'">'.Display::return_icon('up.png', get_lang('Up'),'',ICON_SIZE_SMALL).'</a>';
+                        $actions_first_col .= ' <a href="'.api_get_self().'?action=moveup&'.api_get_cidreq().'&thematic_id='.$my_thematic_id.$params.$url_token.'">'.Display::return_icon('up.png', get_lang('Up'), '', ICON_SIZE_SMALL).'</a>';
                     } else {
-                        $actions_first_col .= ' '.Display::return_icon('up_na.png','&nbsp;','',ICON_SIZE_SMALL);
+                        $actions_first_col .= ' '.Display::return_icon('up_na.png', '&nbsp;', '', ICON_SIZE_SMALL);
                     }
                     if (isset($thematic['max_thematic_item']) && $thematic['display_order'] < $thematic['max_thematic_item']) {
-                        $actions_first_col .= ' <a href="'.api_get_self().'?action=movedown&a'.api_get_cidreq().'&thematic_id='.$my_thematic_id.$params.$url_token.'">'.Display::return_icon('down.png',get_lang('Down'),'',ICON_SIZE_SMALL).'</a>';
+                        $actions_first_col .= ' <a href="'.api_get_self().'?action=movedown&a'.api_get_cidreq().'&thematic_id='.$my_thematic_id.$params.$url_token.'">'.Display::return_icon('down.png', get_lang('Down'), '', ICON_SIZE_SMALL).'</a>';
                     } else {
-                        $actions_first_col .= ' '.Display::return_icon('down_na.png','&nbsp;','',ICON_SIZE_SMALL);
+                        $actions_first_col .= ' '.Display::return_icon('down_na.png', '&nbsp;', '', ICON_SIZE_SMALL);
                     }
 
                 }
                 if (api_get_session_id() == $thematic['session_id']) {
-                    $actions_first_col .= '<a href="index.php?'.api_get_cidreq().'&action=thematic_edit&thematic_id='.$my_thematic_id.$params.$url_token.'">'.Display::return_icon('edit.png',get_lang('Edit'),'',ICON_SIZE_SMALL).'</a>';
-                    $actions_first_col .= '<a onclick="javascript:if(!confirm(\''.get_lang('AreYouSureToDelete').'\')) return false;" href="index.php?'.api_get_cidreq().'&action=thematic_delete&thematic_id='.$my_thematic_id.$params.$url_token.'">'.Display::return_icon('delete.png',get_lang('Delete'),'',ICON_SIZE_SMALL).'</a>';
+                    $actions_first_col .= '<a href="index.php?'.api_get_cidreq().'&action=thematic_edit&thematic_id='.$my_thematic_id.$params.$url_token.'">'.Display::return_icon('edit.png', get_lang('Edit'), '', ICON_SIZE_SMALL).'</a>';
+                    $actions_first_col .= '<a onclick="javascript:if(!confirm(\''.get_lang('AreYouSureToDelete').'\')) return false;" href="index.php?'.api_get_cidreq().'&action=thematic_delete&thematic_id='.$my_thematic_id.$params.$url_token.'">'.Display::return_icon('delete.png', get_lang('Delete'), '', ICON_SIZE_SMALL).'</a>';
                 }
 
                 $actions_first_col = Display::div($actions_first_col, array('id'=>'thematic_id_content_'.$thematic['id'], 'class'=>'thematic_tools'));
@@ -149,7 +149,7 @@ 
             //if (api_is_allowed_to_edit(null, true) &&  api_get_session_id() == $thematic['session_id']) {
             if (api_is_allowed_to_edit(null, true)) {
                 echo '<div style="text-align:right"><a href="index.php?'.api_get_cidreq().'&origin=thematic_details&action=thematic_plan_list&thematic_id='.$thematic['id'].'&width=700&height=500">'.
-                    Display::return_icon('edit.png', get_lang('EditThematicPlan'), array('style'=>'vertical-align:middle'),ICON_SIZE_MEDIUM).'</a></div><br />';
+                    Display::return_icon('edit.png', get_lang('EditThematicPlan'), array('style'=>'vertical-align:middle'), ICON_SIZE_MEDIUM).'</a></div><br />';
             }
 
             if (empty($thematic_plan_div[$thematic['id']])) {
@@ -165,7 +165,7 @@ 
             //if (api_is_allowed_to_edit(null, true) &&  api_get_session_id() == $thematic['session_id']) {
             if (api_is_allowed_to_edit(null, true)) {
                 echo '<div style="text-align:right"><a href="index.php?'.api_get_cidreq().'&action=thematic_advance_add&thematic_id='.$thematic['id'].'">'.
-                    Display::return_icon('add.png',get_lang('NewThematicAdvance'),'',ICON_SIZE_MEDIUM).'</a></div>';
+                    Display::return_icon('add.png', get_lang('NewThematicAdvance'), '', ICON_SIZE_MEDIUM).'</a></div>';
             }
 
             //if (api_is_allowed_to_edit(null, true) &&  api_get_session_id() == $thematic['session_id']) {
@@ -187,7 +187,7 @@ 
                                 [],
                                 ICON_SIZE_SMALL
                             ),
-                            'index.php?' . api_get_cidreq() . '&' . http_build_query([
+                            'index.php?'.api_get_cidreq().'&'.http_build_query([
                                 'action' => 'thematic_advance_edit',
                                 'thematic_id' => $thematic['id'],
                                 'thematic_advance_id' => $thematic_advance['id'],
@@ -198,17 +198,17 @@ 
                                 'data-title' => get_lang('EditThematicAdvance')
                             ]
                         );
-                        $edit_link  .= '<a onclick="javascript:if(!confirm(\''.get_lang('AreYouSureToDelete').'\')) return false;" href="index.php?'.api_get_cidreq().'&action=thematic_advance_delete&thematic_id='.$thematic['id'].'&thematic_advance_id='.$thematic_advance['id'].'">'.
-                            Display::return_icon('delete.png',get_lang('Delete'),'',ICON_SIZE_SMALL).'</a></center>';
+                        $edit_link .= '<a onclick="javascript:if(!confirm(\''.get_lang('AreYouSureToDelete').'\')) return false;" href="index.php?'.api_get_cidreq().'&action=thematic_advance_delete&thematic_id='.$thematic['id'].'&thematic_advance_id='.$thematic_advance['id'].'">'.
+                            Display::return_icon('delete.png', get_lang('Delete'), '', ICON_SIZE_SMALL).'</a></center>';
 
                         //Links
                         $edit_link = Display::div(
-                            Display::div($edit_link , array('id'=>'thematic_advance_tools_'.$thematic_advance['id'], 'class'=>'thematic_advance_actions')),
+                            Display::div($edit_link, array('id'=>'thematic_advance_tools_'.$thematic_advance['id'], 'class'=>'thematic_advance_actions')),
                             array('style'=>'height:20px;')
                         );
                     }
 
-                    $thematic_advance_item =  isset($thematic_advance_div[$thematic['id']][$thematic_advance['id']]) ? $thematic_advance_div[$thematic['id']][$thematic_advance['id']] : null;
+                    $thematic_advance_item = isset($thematic_advance_div[$thematic['id']][$thematic_advance['id']]) ? $thematic_advance_div[$thematic['id']][$thematic_advance['id']] : null;
                     echo Display::div($thematic_advance_item, array('id'=>'thematic_advance_'.$thematic_advance['id']));
                     echo $edit_link;
                     echo '</td>';
@@ -253,7 +253,7 @@ 
 } elseif ($action == 'thematic_add' || $action == 'thematic_edit') {
 
     // Display form
-    $form = new FormValidator('thematic_add','POST','index.php?action=thematic_add&'.api_get_cidreq());
+    $form = new FormValidator('thematic_add', 'POST', 'index.php?action=thematic_add&'.api_get_cidreq());
 
     if ($action == 'thematic_edit') {
         $form->addElement('header', '', get_lang('EditThematicSection'));
@@ -263,7 +263,7 @@ 
     $form->addElement('hidden', 'action', $action);
 
     if (!empty($thematic_id)) {
-        $form->addElement('hidden', 'thematic_id',$thematic_id);
+        $form->addElement('hidden', 'thematic_id', $thematic_id);
     }
 
     $form->addText('title', get_lang('Title'), true, array('size'=>'50'));
@@ -275,8 +275,8 @@ 
     if (!empty($thematic_data)) {
         if (api_get_session_id()) {
             if ($thematic_data['session_id'] != api_get_session_id()) {
-                $show_form  = false;
-                Display::display_error_message(get_lang('NotAllowedClickBack'),false);
+                $show_form = false;
+                Display::display_error_message(get_lang('NotAllowedClickBack'), false);
             }
         }
         // set default values
@@ -287,14 +287,14 @@ 
 
     // error messages
     if (isset($error)) {
-        Display::display_error_message(get_lang('FormHasErrorsPleaseComplete'),false);
+        Display::display_error_message(get_lang('FormHasErrorsPleaseComplete'), false);
     }
     if ($show_form) {
         $form->display();
     }
 } elseif ($action == 'thematic_import_select') {
     // Create form to upload csv file.
-    $form = new FormValidator('thematic_import','POST','index.php?action=thematic_import&'.api_get_cidreq().$url_token);
+    $form = new FormValidator('thematic_import', 'POST', 'index.php?action=thematic_import&'.api_get_cidreq().$url_token);
     $form->addElement('header', get_lang('ImportThematic'));
     $form->addElement('file', 'file');
     $form->addElement('checkbox', 'replace', null, get_lang('DeleteAllThematic'));

main/cron/cleanup.php

Spacing +4 added lines, -4 removed lines

@@ -15,9 +15,9 @@ 
 $a_dir = realpath($dir.'/../../archive/');
 $list = scandir($a_dir);
 // calculate 7 days
-$t = time()-(86400*7);
+$t = time() - (86400 * 7);
 foreach ($list as $item) {
-    if (substr($item,0,1) == '.') {
+    if (substr($item, 0, 1) == '.') {
         continue;
     }
     $stat = @stat($a_dir.'/'.$item);
@@ -34,11 +34,11 @@ 
  * Delete a file or recursively delete a directory
  * @param string $str Path to file or directory
  */
-function recursive_delete($str){
+function recursive_delete($str) {
     if (is_file($str)) {
         return @unlink($str);
     } elseif (is_dir($str)) {
-        $scan = glob(rtrim($str,'/').'/*');
+        $scan = glob(rtrim($str, '/').'/*');
         foreach ($scan as $index=>$path) {
             recursive_delete($path);
         }

main/cron/remind_course_expiration.php

Spacing +6 added lines, -6 removed lines

@@ -5,7 +5,7 @@ 
  * @package chamilo.cron
  * @author Imanol Losada <imanol.losada@beeznest.com>
  */
-require_once __DIR__ . '/../inc/global.inc.php';
+require_once __DIR__.'/../inc/global.inc.php';
 
 /**
  * Initialization
@@ -64,7 +64,7 @@ 
 
 foreach ($sessions as $sessionId => $userIds) {
     $userId = 0;
-    $userIds = $userIds ? " AND sessionUser.user_id NOT IN (" . implode(", ", $userIds) . ")" : null;
+    $userIds = $userIds ? " AND sessionUser.user_id NOT IN (".implode(", ", $userIds).")" : null;
     $query = "
         SELECT sessionUser.session_id, sessionUser.user_id, session.name, session.access_end_date 
         FROM $sessionUserTable AS sessionUser
@@ -156,10 +156,10 @@ 
                 $administrator['completeName'],
                 $administrator['email']
             );
-            echo "Email sent to $userCompleteName (" . $user['email'] . ")\n";
-            echo "Session: " . $session['name'] . "\n";
-            echo "Date end: " . $session['access_end_date'] . "\n";
-            echo "Days remaining: " . $daysRemaining->format("%d") . "\n\n";
+            echo "Email sent to $userCompleteName (".$user['email'].")\n";
+            echo "Session: ".$session['name']."\n";
+            echo "Date end: ".$session['access_end_date']."\n";
+            echo "Days remaining: ".$daysRemaining->format("%d")."\n\n";
         }
         echo "======================================================================\n\n";
     }

main/cron/course_finished.php

Spacing +7 added lines, -7 removed lines

@@ -6,7 +6,7 @@ 
  * @author Angel Fernando Quiroz Campos <angel.quiroz@beeznest.com>
  * @package chamilo.cron
  */
-require_once __DIR__ . '/../inc/global.inc.php';
+require_once __DIR__.'/../inc/global.inc.php';
 
 if (php_sapi_name() != 'cli') {
     exit; //do not run from browser
@@ -32,7 +32,7 @@ 
     ->getResult();
 
 if (empty($sessions)) {
-    echo "No sessions finishing today $endDate" . PHP_EOL;
+    echo "No sessions finishing today $endDate".PHP_EOL;
     exit;
 }
 
@@ -50,7 +50,7 @@ 
     $sessionUsers = $session->getUsers();
 
     if (empty($sessionUsers)) {
-        echo 'No users to send mail' . PHP_EOL;
+        echo 'No users to send mail'.PHP_EOL;
         exit;
     }
 
@@ -81,9 +81,9 @@ 
             $administrator['email']
         );
 
-        echo '============' . PHP_EOL;
-        echo "Email sent to: {$user->getCompleteName()} ({$user->getEmail()})" . PHP_EOL;
-        echo "Session: {$session->getName()}" . PHP_EOL;
-        echo "End date: {$session->getAccessEndDate()->format('Y-m-d h:i')}" . PHP_EOL;
+        echo '============'.PHP_EOL;
+        echo "Email sent to: {$user->getCompleteName()} ({$user->getEmail()})".PHP_EOL;
+        echo "Session: {$session->getName()}".PHP_EOL;
+        echo "End date: {$session->getAccessEndDate()->format('Y-m-d h:i')}".PHP_EOL;
     }
 }

main/cron/hosting_total_size_limit.php

Spacing +2 added lines, -2 removed lines

@@ -97,7 +97,7 @@ 
     $totalSize = $row['total'];
 
     if ($debug) {
-        echo "Total size in table $table " . (round($totalSize / 1024)) . " MB \n";
+        echo "Total size in table $table ".(round($totalSize / 1024))." MB \n";
     }
 
     $table = Database::get_course_table(TABLE_FORUM_ATTACHMENT);
@@ -107,7 +107,7 @@ 
     $subTotal = $row['total'];
     $totalSize += $subTotal;
     if ($debug) {
-        echo "Total size in table $table " . (round($subTotal / 1024)) . " MB \n";
+        echo "Total size in table $table ".(round($subTotal / 1024))." MB \n";
     }
 
     $totalSize = $totalSize / 1024;

main/cron/document/index_all_docs.php

Indentation +16 added lines, -16 removed lines

@@ -8,9 +8,9 @@ 
 die();
 require '../../inc/global.inc.php';
 if (empty($_GET['doc'])) {
-  echo "To add a document name to search, add ?doc=abc to the URL\n";
+    echo "To add a document name to search, add ?doc=abc to the URL\n";
 } else {
-  echo "Received param ".$_GET['doc']."<br />\n";
+    echo "Received param ".$_GET['doc']."<br />\n";
 }
 $allowed_mime_types = DocumentManager::file_get_mime_type(true);
 $allowed_extensions = array(
@@ -40,30 +40,30 @@ 
 $specific_fields = get_specific_field_list();
 $specific_fields_values = array();
 foreach ($specific_fields as $sf) {
-	$specific_fields_values[$sf['code']] = '';
+    $specific_fields_values[$sf['code']] = '';
 }
 $td = Database::get_course_table(TABLE_DOCUMENT);
 
 foreach ($courses_list as $course) {
-  $course_dir = $course['directory'].'/document';
-  $title = Database::escape_string($_GET['doc']);
-  $sql = "SELECT id, path, session_id FROM $td WHERE c_id = ".$course['id']." AND path LIKE '%$title%' or title LIKE '%$title%'";
-  $res = Database::query($sql);
-  if (Database::num_rows($res)>0) {
+    $course_dir = $course['directory'].'/document';
+    $title = Database::escape_string($_GET['doc']);
+    $sql = "SELECT id, path, session_id FROM $td WHERE c_id = ".$course['id']." AND path LIKE '%$title%' or title LIKE '%$title%'";
+    $res = Database::query($sql);
+    if (Database::num_rows($res)>0) {
     while ($row = Database::fetch_array($res)) {
-      $doc_path = api_get_path(SYS_COURSE_PATH).$course_dir.$row['path'];
-      $extensions = preg_split("/[\/\\.]/", $doc_path);
-      $doc_ext = strtolower($extensions[count($extensions) - 1]);
-      if (in_array($doc_ext, $allowed_extensions) && !is_dir($doc_path)) {
+        $doc_path = api_get_path(SYS_COURSE_PATH).$course_dir.$row['path'];
+        $extensions = preg_split("/[\/\\.]/", $doc_path);
+        $doc_ext = strtolower($extensions[count($extensions) - 1]);
+        if (in_array($doc_ext, $allowed_extensions) && !is_dir($doc_path)) {
         $doc_mime = mime_content_type($doc_path);
         echo "Indexing doc ".$row['id']." (".$row['path'].") in course ".$course['code']."\n";
         $residx = DocumentManager::index_document($row['id'], $course['code'], $row['session_id'], $course['course_language'], $specific_fields_values);
         if ($residx) {
-        	echo "Success\n";
+            echo "Success\n";
         } else {
-        	echo "Failure\n";
+            echo "Failure\n";
         }
-      }
+        }
+    }
     }
-  }
 }

Spacing +2 added lines, -2 removed lines

@@ -12,13 +12,13 @@
 } else {
   echo "Received param ".Security::remove_XSS($_GET['doc'])."<br />";
 }
-$courses_list =  CourseManager::get_courses_list();
+$courses_list = CourseManager::get_courses_list();
 foreach ($courses_list as $course) {
   $title = Database::escape_string($_GET['doc']);
   $td = Database::get_course_table(TABLE_DOCUMENT);
   $sql = "SELECT id, path FROM $td WHERE c_id = ".$course['id']." AND path LIKE '%$title%' OR title LIKE '%$title%'";
   $res = Database::query($sql);
-  if (Database::num_rows($res)>0) {
+  if (Database::num_rows($res) > 0) {
     while ($row = Database::fetch_array($res)) {
       echo "Found doc ".$row['id']."-> ".$row['path']." in course ".$course['code']."<br />";
     }