chamilo / chamilo-lms

main/admin/ldap_form_add_users_group.php

Spacing +11 added lines, -11 removed lines

@@ -9,7 +9,7 @@ 
 /**
  * This form is included by ldap_import_students.php and ldap_import_students_to_session.php
  */
-$nbre=0;
+$nbre = 0;
 echo '<form name="form" method="post" action="'.api_get_self().'?annee='.Security::remove_XSS($annee).'">';
 if ($statut == 1) {
     echo get_lang(
@@ -28,23 +28,23 @@ 
 $is_western_name_order = api_is_western_name_order();
 echo '<input type="hidden" name="confirmed" value="yes">';
 echo '<table border="0" cellspacing="0" width="100%">';
-echo '<tr align="center" id="header3">' .
-		'<td width="15%"><input type="button" value="'.get_lang('AllSlashNone').'" onClick="checkAll();"></td>' .
-		'<td width="40%"><b>'.get_lang('Email').'</b></td>' .
+echo '<tr align="center" id="header3">'.
+		'<td width="15%"><input type="button" value="'.get_lang('AllSlashNone').'" onClick="checkAll();"></td>'.
+		'<td width="40%"><b>'.get_lang('Email').'</b></td>'.
 		($is_western_name_order
-			? '<td width="15%"><b>'.get_lang('FirstName').'</b></td>' .
+			? '<td width="15%"><b>'.get_lang('FirstName').'</b></td>'.
 			'<td width="15%"><b>'.get_lang('Name').'</b></td>'
-			: '<td width="15%"><b>'.get_lang('Name').'</b></td>' .
-			'<td width="15%"><b>'.get_lang('FirstName').'</b></td>') .
-		'<td width="15%"><b>'.get_lang('Login').'</b></td>' .
+			: '<td width="15%"><b>'.get_lang('Name').'</b></td>'.
+			'<td width="15%"><b>'.get_lang('FirstName').'</b></td>').
+		'<td width="15%"><b>'.get_lang('Login').'</b></td>'.
 	  '</tr>'."\n";
 while (list ($key, $val) = each($nom_form)) {
-	$nbre=$nbre+1;
-	if($nbre & 1) $ndiv=2; else $ndiv=3;
+	$nbre = $nbre + 1;
+	if ($nbre & 1) $ndiv = 2; else $ndiv = 3;
 	echo '<tr align="center" id="header'.$ndiv.'">';
 	echo '<td><input type="checkbox" name="checkboxes[]" value="'.$key.'" checked="checked"></td>';
 	echo '<td>'.$email_form[$key].'<input type="hidden" name="email_form['.$key.']" size="40" value="'.$email_form[$key].'"></td>';
-	if ($is_western_name_order)	{
+	if ($is_western_name_order) {
 		echo '<td>'.$prenom_form[$key].'<input type="hidden" name="prenom_form['.$key.']" size="20" value="'.$prenom_form[$key].'"></td>';
 		echo '<td>'.$nom_form[$key].'<input type="hidden" name="nom_form['.$key.']" size="20" value="'.$nom_form[$key].'"></td>';
 	} else {

plugin/ims_lti/edit.php

Spacing +2 added lines, -2 removed lines

@@ -20,7 +20,7 @@ 
         Display::return_message($plugin->get_lang('NoTool'), 'error')
     );
 
-    header('Location: ' . api_get_path(WEB_PLUGIN_PATH) . 'ims_lti/list.php');
+    header('Location: '.api_get_path(WEB_PLUGIN_PATH).'ims_lti/list.php');
     exit;
 }
 
@@ -58,7 +58,7 @@ 
         Display::return_message($plugin->get_lang('ToolEdited'), 'success')
     );
 
-    header('Location: ' . api_get_path(WEB_PLUGIN_PATH) . 'ims_lti/list.php');
+    header('Location: '.api_get_path(WEB_PLUGIN_PATH).'ims_lti/list.php');
     exit;
 }
 

main/inc/lib/webservices/Rest.php

Spacing +23 added lines, -23 removed lines

@@ -238,7 +238,7 @@ 
             'urlPicture' => $this->course->getPicturePath(true),
             'teachers' => $teachers,
             'tools' => array_map(
-                function ($tool) {
+                function($tool) {
                     return ['type' => $tool['name']];
                 },
                 $tools
@@ -261,7 +261,7 @@ 
             $results[] = [
                 'id' => $description->get_description_type(),
                 'title' => $description->get_title(),
-                'content' => str_replace('src="/', 'src="' . api_get_path(WEB_PATH), $description->get_content())
+                'content' => str_replace('src="/', 'src="'.api_get_path(WEB_PATH), $description->get_content())
             ];
         }
 
@@ -294,7 +294,7 @@ 
 
             $path = $directory['path'];
         }
-        require_once api_get_path(LIBRARY_PATH) . 'fileDisplay.lib.php';
+        require_once api_get_path(LIBRARY_PATH).'fileDisplay.lib.php';
 
         $courseInfo = api_get_course_info_by_id($this->course->getId());
         $documents = DocumentManager::get_all_document_data(
@@ -309,7 +309,7 @@ 
         $results = [];
 
         if (is_array($documents)) {
-            $webPath = api_get_path(WEB_CODE_PATH) . 'document/document.php?';
+            $webPath = api_get_path(WEB_CODE_PATH).'document/document.php?';
 
             /** @var array $document */
             foreach ($documents as $document) {
@@ -326,7 +326,7 @@ 
                     'type' => $document['filetype'],
                     'title' => $document['title'],
                     'path' => $document['path'],
-                    'url' => $webPath . http_build_query([
+                    'url' => $webPath.http_build_query([
                         'username' => $this->user->getUsername(),
                         'api_key' => $this->apiKey,
                         'cidReq' => $this->course->getCode(),
@@ -370,7 +370,7 @@ 
             $sessionId
         );
 
-        $announcements = array_map(function ($announcement) {
+        $announcements = array_map(function($announcement) {
             return [
                 'id' => intval($announcement['id']),
                 'title' => strip_tags($announcement['title']),
@@ -452,11 +452,11 @@ 
         $webPath = api_get_path(WEB_PATH);
 
         return array_map(
-            function ($event) use ($webPath) {
+            function($event) use ($webPath) {
                 return [
                     'id' => intval($event['unique_id']),
                     'title' => $event['title'],
-                    'content' => str_replace('src="/', 'src="' . $webPath, $event['description']),
+                    'content' => str_replace('src="/', 'src="'.$webPath, $event['description']),
                     'startDate' => $event['start_date_localtime'],
                     'endDate' => $event['end_date_localtime'],
                     'isAllDay' => $event['allDay'] ? true : false
@@ -478,7 +478,7 @@ 
         $notebooks = $notebooksRepo->findByUser($this->user, $this->course, $this->session);
 
         return array_map(
-            function (\Chamilo\CourseBundle\Entity\CNotebook $notebook) {
+            function(\Chamilo\CourseBundle\Entity\CNotebook $notebook) {
                 return [
                     'id' => $notebook->getIid(),
                     'title' => $notebook->getTitle(),
@@ -502,9 +502,9 @@ 
     public function getCourseForumCategories()
     {
         $sessionId = $this->session ? $this->session->getId() : 0;
-        $webCoursePath = api_get_path(WEB_COURSE_PATH) . $this->course->getDirectory() . '/upload/forum/images/';
+        $webCoursePath = api_get_path(WEB_COURSE_PATH).$this->course->getDirectory().'/upload/forum/images/';
 
-        require_once api_get_path(SYS_CODE_PATH) . 'forum/forumfunction.inc.php';
+        require_once api_get_path(SYS_CODE_PATH).'forum/forumfunction.inc.php';
 
         $categoriesFullData = get_forum_categories('', $this->course->getId(), $sessionId);
         $categories = [];
@@ -518,7 +518,7 @@ 
                 'catId' => intval($forumInfo['forum_category']),
                 'title' => $forumInfo['forum_title'],
                 'description' => $forumInfo['forum_comment'],
-                'image' => $forumInfo['forum_image'] ? ($webCoursePath . $forumInfo['forum_image']) : '',
+                'image' => $forumInfo['forum_image'] ? ($webCoursePath.$forumInfo['forum_image']) : '',
                 'numberOfThreads' => isset($forumInfo['number_of_threads']) ? intval($forumInfo['number_of_threads']) : 0,
                 'lastPost' => null
             ];
@@ -541,7 +541,7 @@ 
         foreach ($categoriesFullData as $category) {
             $categoryForums = array_filter(
                 $forums,
-                function (array $forum) use ($category) {
+                function(array $forum) use ($category) {
                     if ($forum['catId'] != $category['cat_id']) {
                         return false;
                     }
@@ -570,7 +570,7 @@ 
      */
     public function getCourseForum($forumId)
     {
-        require_once api_get_path(SYS_CODE_PATH) . 'forum/forumfunction.inc.php';
+        require_once api_get_path(SYS_CODE_PATH).'forum/forumfunction.inc.php';
 
         $forumInfo = get_forums($forumId, $this->course->getCode());
 
@@ -578,12 +578,12 @@ 
             throw new Exception(get_lang('NoForum'));
         }
 
-        $webCoursePath = api_get_path(WEB_COURSE_PATH) . $this->course->getDirectory() . '/upload/forum/images/';
+        $webCoursePath = api_get_path(WEB_COURSE_PATH).$this->course->getDirectory().'/upload/forum/images/';
         $forum = [
             'id' => $forumInfo['iid'],
             'title' => $forumInfo['forum_title'],
             'description' => $forumInfo['forum_comment'],
-            'image' => $forumInfo['forum_image'] ? ($webCoursePath . $forumInfo['forum_image']) : '',
+            'image' => $forumInfo['forum_image'] ? ($webCoursePath.$forumInfo['forum_image']) : '',
             'threads' => []
         ];
 
@@ -610,7 +610,7 @@ 
      */
     public function getCourseForumThread($forumId, $threadId)
     {
-        require_once api_get_path(SYS_CODE_PATH) . 'forum/forumfunction.inc.php';
+        require_once api_get_path(SYS_CODE_PATH).'forum/forumfunction.inc.php';
 
         $threadInfo = get_thread_information($forumId, $threadId);
 
@@ -648,7 +648,7 @@ 
         $pictureInfo = UserManager::get_user_picture_path_by_id($this->user->getId(), 'web');
 
         $result = [
-            'pictureUri' => $pictureInfo['dir'] . $pictureInfo['file'],
+            'pictureUri' => $pictureInfo['dir'].$pictureInfo['file'],
             'fullName' => $this->user->getCompleteName(),
             'username' => $this->user->getUsername(),
             'officialCode' => $this->user->getOfficialCode(),
@@ -758,7 +758,7 @@ 
                     'id' => $lpId,
                     'title' => Security::remove_XSS($lpDetails['lp_name']),
                     'progress' => intval($progress),
-                    'url' => api_get_path(WEB_CODE_PATH) . 'webservices/api/v2.php?' . http_build_query([
+                    'url' => api_get_path(WEB_CODE_PATH).'webservices/api/v2.php?'.http_build_query([
                         'hash' => $this->encodeParams([
                             'action' => 'course_learnpath',
                             'lp_id' => $lpId,
@@ -805,7 +805,7 @@ 
      * @param string $encoded
      * @return array
      */
-    public static function decodeParams($encoded){
+    public static function decodeParams($encoded) {
         $decoded = str_replace(['-', '_', '.'], ['+', '/', '='], $encoded);
         $mod4 = strlen($decoded) % 4;
 
@@ -833,7 +833,7 @@ 
         ChamiloSession::write('_user', $loggedUser);
         Login::init_user($this->user->getId(), true);
 
-        $url = api_get_path(WEB_CODE_PATH) . 'lp/lp_controller.php?' . http_build_query([
+        $url = api_get_path(WEB_CODE_PATH).'lp/lp_controller.php?'.http_build_query([
             'cidReq' => $this->course->getCode(),
             'id_session' => $sessionId,
             'gidReq' => 0,
@@ -855,7 +855,7 @@ 
      */
     public function saveForumPost(array $postValues, $forumId)
     {
-        require_once api_get_path(SYS_CODE_PATH) . 'forum/forumfunction.inc.php';
+        require_once api_get_path(SYS_CODE_PATH).'forum/forumfunction.inc.php';
 
         $forum = get_forums($forumId, $this->course->getCode());
 
@@ -992,7 +992,7 @@ 
      */
     public function saveForumThread(array $values, $forumId)
     {
-        require_once api_get_path(SYS_CODE_PATH) . 'forum/forumfunction.inc.php';
+        require_once api_get_path(SYS_CODE_PATH).'forum/forumfunction.inc.php';
 
         $forum = get_forums($forumId, $this->course->getCode());
         $courseInfo = api_get_course_info($this->course->getCode());

main/lp/openoffice_presentation.class.php

Spacing +7 added lines, -7 removed lines

@@ -98,7 +98,7 @@ 
             );
 
             // Generating the thumbnail.
-            $image = $this->base_work_dir.$dir . $file_name;
+            $image = $this->base_work_dir.$dir.$file_name;
 
             $pattern = '/(\w+)\.png$/';
             $replacement = '${1}_thumb.png';
@@ -114,7 +114,7 @@ 
 
             $my_new_image = new Image($image);
             $my_new_image->resize($thumb_width, $thumb_height);
-            $my_new_image->send_image($this->base_work_dir.$dir . $thumb_name, -1, 'png');
+            $my_new_image->send_image($this->base_work_dir.$dir.$thumb_name, -1, 'png');
 
             // Adding the thumbnail to documents.
             $document_id_thumb = add_document(
@@ -140,7 +140,7 @@ 
     <body>
         <img src="'.$slide_src.'" />
     </body>
-</html>');  // This indentation is to make the generated html files to look well.
+</html>'); // This indentation is to make the generated html files to look well.
 
             fclose($fp);
             $document_id = add_document(
@@ -175,7 +175,7 @@ 
                     foreach ($specific_fields as $specific_field) {
                         if (isset($_REQUEST[$specific_field['code']])) {
                             $sterms = trim($_REQUEST[$specific_field['code']]);
-                            $all_specific_terms .= ' '. $sterms;
+                            $all_specific_terms .= ' '.$sterms;
                             if (!empty($sterms)) {
                                 $sterms = explode(',', $sterms);
                                 foreach ($sterms as $sterm) {
@@ -184,7 +184,7 @@ 
                             }
                         }
                     }
-                    $slide_body = $all_specific_terms .' '. $slide_body;
+                    $slide_body = $all_specific_terms.' '.$slide_body;
                     $ic_slide->addValue('content', $slide_body);
                     /* FIXME:  cidReq:lp_id:doc_id al indexar  */
                     // Add a comment to say terms separated by commas.
@@ -196,7 +196,7 @@ 
                         SE_COURSE_ID => $courseid,
                         SE_TOOL_ID => TOOL_LEARNPATH,
                         SE_DATA => array('lp_id' => $lp_id, 'lp_item' => $previous, 'document_id' => $document_id),
-                        SE_USER => (int)api_get_user_id(),
+                        SE_USER => (int) api_get_user_id(),
                     );
                     $ic_slide->xapian_data = serialize($xapian_data);
                     $di->addChunk($ic_slide);
@@ -234,7 +234,7 @@ 
         $_course = api_get_course_info();
         foreach ($files as $file) {
             // '||' is used as separator between slide name (with accents) and file name (without accents).
-            list($slide_name,$file_name) = explode('||',$file);
+            list($slide_name, $file_name) = explode('||', $file);
             $slide_name = api_htmlentities($slide_name, ENT_COMPAT, $this->original_charset);
             $slide_name = str_replace('&rsquo;', '\'', $slide_name);
             $slide_name = api_convert_encoding($slide_name, api_get_system_encoding(), $this->original_charset);

src/Chamilo/CoreBundle/EventListener/LogoutSuccessHandler.php

Spacing +2 added lines, -2 removed lines

@@ -62,7 +62,7 @@ 
                 LIMIT 0,1";
         $row = Database::query($sql);
         $loginId = null;
-        if (Database::num_rows($row)>0) {
+        if (Database::num_rows($row) > 0) {
             $loginId = Database::result($row, 0, "login_id");
         }
 
@@ -77,7 +77,7 @@ 
 
         $online_table = Database::get_main_table(TABLE_STATISTIC_TRACK_E_ONLINE);
 
-        $query = "DELETE FROM " . $online_table . " WHERE login_user_id = $userId";
+        $query = "DELETE FROM ".$online_table." WHERE login_user_id = $userId";
         Database::query($query);
 
         /*require_once api_get_path(SYS_PATH) . 'main/chat/chat_functions.lib.php';

main/install/update-files-1.9.0-1.10.0.inc.php

Spacing +11 added lines, -11 removed lines

@@ -14,7 +14,7 @@ 
  * current configuration file.
  * @package chamilo.install
  */
-error_log("Starting " . basename(__FILE__));
+error_log("Starting ".basename(__FILE__));
 
 global $debug;
 
@@ -143,12 +143,12 @@ 
 
     $list = scandir($langPath);
     foreach ($list as $entry) {
-        if (is_dir($langPath . $entry) &&
+        if (is_dir($langPath.$entry) &&
             in_array($entry, $officialLanguages)
         ) {
             foreach ($filesToDelete as $file) {
-                if (is_file($langPath . $entry . '/' . $file . '.inc.php')) {
-                    unlink($langPath . $entry . '/' . $file . '.inc.php');
+                if (is_file($langPath.$entry.'/'.$file.'.inc.php')) {
+                    unlink($langPath.$entry.'/'.$file.'.inc.php');
                 }
             }
         }
@@ -173,12 +173,12 @@ 
 
     // Move dirs into new structures.
     $movePathList = [
-        api_get_path(SYS_CODE_PATH).'upload/users/groups' => api_get_path(SYS_UPLOAD_PATH) . 'groups',
-        api_get_path(SYS_CODE_PATH).'upload/users' => api_get_path(SYS_UPLOAD_PATH) . 'users',
-        api_get_path(SYS_CODE_PATH).'upload/badges' => api_get_path(SYS_UPLOAD_PATH) . 'badges',
-        api_get_path(SYS_PATH).'courses' => api_get_path(SYS_APP_PATH) . 'courses',
+        api_get_path(SYS_CODE_PATH).'upload/users/groups' => api_get_path(SYS_UPLOAD_PATH).'groups',
+        api_get_path(SYS_CODE_PATH).'upload/users' => api_get_path(SYS_UPLOAD_PATH).'users',
+        api_get_path(SYS_CODE_PATH).'upload/badges' => api_get_path(SYS_UPLOAD_PATH).'badges',
+        api_get_path(SYS_PATH).'courses' => api_get_path(SYS_APP_PATH).'courses',
         api_get_path(SYS_PATH).'searchdb' => api_get_path(SYS_UPLOAD_PATH).'plugins/xapian/',
-        api_get_path(SYS_PATH).'home' => api_get_path(SYS_APP_PATH) . 'home'
+        api_get_path(SYS_PATH).'home' => api_get_path(SYS_APP_PATH).'home'
     ];
 
     if ($debug) {
@@ -199,7 +199,7 @@ 
                 $fs->remove($origin);
             } catch (IOException $e) {
                 // If removing the directory doesn't work, just log an error and continue
-                error_log('Could not move ' . $origin . ' to ' . $destination . '(' . $e->getMessage() . '). Please move it manually.');
+                error_log('Could not move '.$origin.' to '.$destination.'('.$e->getMessage().'). Please move it manually.');
             }
         }
     }
@@ -246,5 +246,5 @@ 
     @rrmdir(api_get_path(SYS_PATH).'archive');
 
 } else {
-    echo 'You are not allowed here !'. __FILE__;
+    echo 'You are not allowed here !'.__FILE__;
 }

main/inc/lib/fileUpload.lib.php

Spacing +85 added lines, -85 removed lines

@@ -94,7 +94,7 @@ 
                 if ($show_output) {
                     Display::addFlash(
                         Display::return_message(
-                            get_lang('UplExceedMaxPostSize'). format_file_size($max_file_size),
+                            get_lang('UplExceedMaxPostSize').format_file_size($max_file_size),
                             'error'
                         )
                     );
@@ -118,7 +118,7 @@ 
                 if ($show_output) {
                     Display::addFlash(
                         Display::return_message(
-                            get_lang('UplNoFileUploaded').' '. get_lang('UplSelectFileFirst'),
+                            get_lang('UplNoFileUploaded').' '.get_lang('UplSelectFileFirst'),
                             'error'
                         )
                     );
@@ -472,7 +472,7 @@ 
                             if ($output) {
                                 Display::addFlash(
                                     Display::return_message(
-                                        get_lang('UplUploadSucceeded') . '<br /> ' . $documentTitle . ' ' . get_lang('UplFileOverwritten'),
+                                        get_lang('UplUploadSucceeded').'<br /> '.$documentTitle.' '.get_lang('UplFileOverwritten'),
                                         'confirmation',
                                         false
                                     )
@@ -609,7 +609,7 @@ 
                         if ($output) {
                             Display::addFlash(
                                 Display::return_message(
-                                    get_lang('UplUploadSucceeded') . '<br />' . get_lang('UplFileSavedAs') . ' ' . $documentTitle,
+                                    get_lang('UplUploadSucceeded').'<br />'.get_lang('UplFileSavedAs').' '.$documentTitle,
                                     'success',
                                     false
                                 )
@@ -686,7 +686,7 @@ 
                             if ($output) {
                                 Display::addFlash(
                                     Display::display_confirmation_message(
-                                        get_lang('UplUploadSucceeded') . '<br /> ' . $documentTitle,
+                                        get_lang('UplUploadSucceeded').'<br /> '.$documentTitle,
                                         false,
                                         true
                                     )
@@ -772,12 +772,12 @@ 
 function dir_total_space($dir_path)
 {
     $save_dir = getcwd();
-    chdir($dir_path) ;
+    chdir($dir_path);
     $handle = opendir($dir_path);
     $sumSize = 0;
     $dirList = array();
     while ($element = readdir($handle)) {
-        if ( $element == '.' || $element == '..') {
+        if ($element == '.' || $element == '..') {
             continue; // Skip the current and parent directories
         }
         if (is_file($element)) {
@@ -788,11 +788,11 @@ 
         }
     }
 
-    closedir($handle) ;
+    closedir($handle);
 
     if (sizeof($dirList) > 0) {
         foreach ($dirList as $j) {
-            $sizeDir = dir_total_space($j);	// Recursivity
+            $sizeDir = dir_total_space($j); // Recursivity
             $sumSize += $sizeDir;
         }
     }
@@ -826,63 +826,63 @@ 
 
         static $mime_type = array();
 
-        $mime_type[] = 'application/msword';             $extension[] = '.doc';
-        $mime_type[] = 'application/rtf';                $extension[] = '.rtf';
-        $mime_type[] = 'application/vnd.ms-powerpoint';  $extension[] = '.ppt';
-        $mime_type[] = 'application/vnd.ms-excel';       $extension[] = '.xls';
-        $mime_type[] = 'application/pdf';                $extension[] = '.pdf';
-        $mime_type[] = 'application/postscript';         $extension[] = '.ps';
-        $mime_type[] = 'application/mac-binhex40';       $extension[] = '.hqx';
-        $mime_type[] = 'application/x-gzip';             $extension[] = 'tar.gz';
-        $mime_type[] = 'application/x-shockwave-flash';  $extension[] = '.swf';
-        $mime_type[] = 'application/x-stuffit';          $extension[] = '.sit';
-        $mime_type[] = 'application/x-tar';              $extension[] = '.tar';
-        $mime_type[] = 'application/zip';                $extension[] = '.zip';
-        $mime_type[] = 'application/x-tar';              $extension[] = '.tar';
-        $mime_type[] = 'text/html';                      $extension[] = '.html';
-        $mime_type[] = 'text/plain';                     $extension[] = '.txt';
-        $mime_type[] = 'text/rtf';                       $extension[] = '.rtf';
-        $mime_type[] = 'img/gif';                        $extension[] = '.gif';
-        $mime_type[] = 'img/jpeg';                       $extension[] = '.jpg';
-        $mime_type[] = 'img/png';                        $extension[] = '.png';
-        $mime_type[] = 'audio/midi';                     $extension[] = '.mid';
-        $mime_type[] = 'audio/mpeg';                     $extension[] = '.mp3';
-        $mime_type[] = 'audio/x-aiff';                   $extension[] = '.aif';
-        $mime_type[] = 'audio/x-pn-realaudio';           $extension[] = '.rm';
-        $mime_type[] = 'audio/x-pn-realaudio-plugin';    $extension[] = '.rpm';
-        $mime_type[] = 'audio/x-wav';                    $extension[] = '.wav';
-        $mime_type[] = 'video/mpeg';                     $extension[] = '.mpg';
-        $mime_type[] = 'video/mpeg4-generic';            $extension[] = '.mp4';
-        $mime_type[] = 'video/quicktime';                $extension[] = '.mov';
-        $mime_type[] = 'video/x-msvideo';                $extension[] = '.avi';
-
-        $mime_type[] = 'video/x-ms-wmv';                 $extension[] = '.wmv';
-        $mime_type[] = 'video/x-flv';                    $extension[] = '.flv';
-        $mime_type[] = 'image/svg+xml';                  $extension[] = '.svg';
-        $mime_type[] = 'image/svg+xml';                  $extension[] = '.svgz';
-        $mime_type[] = 'video/ogg';                  	 $extension[] = '.ogv';
-        $mime_type[] = 'audio/ogg';                  	 $extension[] = '.oga';
-        $mime_type[] = 'application/ogg';                $extension[] = '.ogg';
-        $mime_type[] = 'application/ogg';                $extension[] = '.ogx';
-        $mime_type[] = 'application/x-freemind';         $extension[] = '.mm';
-
-        $mime_type[] = 'application/vnd.ms-word.document.macroEnabled.12';							$extension[] = '.docm';
-        $mime_type[] = 'application/vnd.openxmlformats-officedocument.wordprocessingml.document';	$extension[] = '.docx';
-        $mime_type[] = 'application/vnd.ms-word.template.macroEnabled.12';							$extension[] = '.dotm';
-        $mime_type[] = 'application/vnd.openxmlformats-officedocument.wordprocessingml.template';	$extension[] = '.dotx';
-        $mime_type[] = 'application/vnd.ms-powerpoint.template.macroEnabled.12';					$extension[] = '.potm';
-        $mime_type[] = 'application/vnd.openxmlformats-officedocument.presentationml.template';		$extension[] = '.potx';
-        $mime_type[] = 'application/vnd.ms-powerpoint.addin.macroEnabled.12';						$extension[] = '.ppam';
-        $mime_type[] = 'application/vnd.ms-powerpoint.slideshow.macroEnabled.12';					$extension[] = '.ppsm';
-        $mime_type[] = 'application/vnd.openxmlformats-officedocument.presentationml.slideshow';	$extension[] = '.ppsx';
-        $mime_type[] = 'application/vnd.ms-powerpoint.presentation.macroEnabled.12';				$extension[] = '.pptm';
-        $mime_type[] = 'application/vnd.openxmlformats-officedocument.presentationml.presentation';	$extension[] = '.pptx';
-        $mime_type[] = 'application/vnd.ms-excel.addin.macroEnabled.12';							$extension[] = '.xlam';
-        $mime_type[] = 'application/vnd.ms-excel.sheet.binary.macroEnabled.12';						$extension[] = '.xlsb';
-        $mime_type[] = 'application/vnd.ms-excel.sheet.macroEnabled.12';							$extension[] = '.xlsm';
-        $mime_type[] = 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet';			$extension[] = '.xlsx';
-        $mime_type[] = 'application/vnd.ms-excel.template.macroEnabled.12';							$extension[] = '.xltm';
-        $mime_type[] = 'application/vnd.openxmlformats-officedocument.spreadsheetml.template';		$extension[] = '.xltx';
+        $mime_type[] = 'application/msword'; $extension[] = '.doc';
+        $mime_type[] = 'application/rtf'; $extension[] = '.rtf';
+        $mime_type[] = 'application/vnd.ms-powerpoint'; $extension[] = '.ppt';
+        $mime_type[] = 'application/vnd.ms-excel'; $extension[] = '.xls';
+        $mime_type[] = 'application/pdf'; $extension[] = '.pdf';
+        $mime_type[] = 'application/postscript'; $extension[] = '.ps';
+        $mime_type[] = 'application/mac-binhex40'; $extension[] = '.hqx';
+        $mime_type[] = 'application/x-gzip'; $extension[] = 'tar.gz';
+        $mime_type[] = 'application/x-shockwave-flash'; $extension[] = '.swf';
+        $mime_type[] = 'application/x-stuffit'; $extension[] = '.sit';
+        $mime_type[] = 'application/x-tar'; $extension[] = '.tar';
+        $mime_type[] = 'application/zip'; $extension[] = '.zip';
+        $mime_type[] = 'application/x-tar'; $extension[] = '.tar';
+        $mime_type[] = 'text/html'; $extension[] = '.html';
+        $mime_type[] = 'text/plain'; $extension[] = '.txt';
+        $mime_type[] = 'text/rtf'; $extension[] = '.rtf';
+        $mime_type[] = 'img/gif'; $extension[] = '.gif';
+        $mime_type[] = 'img/jpeg'; $extension[] = '.jpg';
+        $mime_type[] = 'img/png'; $extension[] = '.png';
+        $mime_type[] = 'audio/midi'; $extension[] = '.mid';
+        $mime_type[] = 'audio/mpeg'; $extension[] = '.mp3';
+        $mime_type[] = 'audio/x-aiff'; $extension[] = '.aif';
+        $mime_type[] = 'audio/x-pn-realaudio'; $extension[] = '.rm';
+        $mime_type[] = 'audio/x-pn-realaudio-plugin'; $extension[] = '.rpm';
+        $mime_type[] = 'audio/x-wav'; $extension[] = '.wav';
+        $mime_type[] = 'video/mpeg'; $extension[] = '.mpg';
+        $mime_type[] = 'video/mpeg4-generic'; $extension[] = '.mp4';
+        $mime_type[] = 'video/quicktime'; $extension[] = '.mov';
+        $mime_type[] = 'video/x-msvideo'; $extension[] = '.avi';
+
+        $mime_type[] = 'video/x-ms-wmv'; $extension[] = '.wmv';
+        $mime_type[] = 'video/x-flv'; $extension[] = '.flv';
+        $mime_type[] = 'image/svg+xml'; $extension[] = '.svg';
+        $mime_type[] = 'image/svg+xml'; $extension[] = '.svgz';
+        $mime_type[] = 'video/ogg'; $extension[] = '.ogv';
+        $mime_type[] = 'audio/ogg'; $extension[] = '.oga';
+        $mime_type[] = 'application/ogg'; $extension[] = '.ogg';
+        $mime_type[] = 'application/ogg'; $extension[] = '.ogx';
+        $mime_type[] = 'application/x-freemind'; $extension[] = '.mm';
+
+        $mime_type[] = 'application/vnd.ms-word.document.macroEnabled.12'; $extension[] = '.docm';
+        $mime_type[] = 'application/vnd.openxmlformats-officedocument.wordprocessingml.document'; $extension[] = '.docx';
+        $mime_type[] = 'application/vnd.ms-word.template.macroEnabled.12'; $extension[] = '.dotm';
+        $mime_type[] = 'application/vnd.openxmlformats-officedocument.wordprocessingml.template'; $extension[] = '.dotx';
+        $mime_type[] = 'application/vnd.ms-powerpoint.template.macroEnabled.12'; $extension[] = '.potm';
+        $mime_type[] = 'application/vnd.openxmlformats-officedocument.presentationml.template'; $extension[] = '.potx';
+        $mime_type[] = 'application/vnd.ms-powerpoint.addin.macroEnabled.12'; $extension[] = '.ppam';
+        $mime_type[] = 'application/vnd.ms-powerpoint.slideshow.macroEnabled.12'; $extension[] = '.ppsm';
+        $mime_type[] = 'application/vnd.openxmlformats-officedocument.presentationml.slideshow'; $extension[] = '.ppsx';
+        $mime_type[] = 'application/vnd.ms-powerpoint.presentation.macroEnabled.12'; $extension[] = '.pptm';
+        $mime_type[] = 'application/vnd.openxmlformats-officedocument.presentationml.presentation'; $extension[] = '.pptx';
+        $mime_type[] = 'application/vnd.ms-excel.addin.macroEnabled.12'; $extension[] = '.xlam';
+        $mime_type[] = 'application/vnd.ms-excel.sheet.binary.macroEnabled.12'; $extension[] = '.xlsb';
+        $mime_type[] = 'application/vnd.ms-excel.sheet.macroEnabled.12'; $extension[] = '.xlsm';
+        $mime_type[] = 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'; $extension[] = '.xlsx';
+        $mime_type[] = 'application/vnd.ms-excel.template.macroEnabled.12'; $extension[] = '.xltm';
+        $mime_type[] = 'application/vnd.openxmlformats-officedocument.spreadsheetml.template'; $extension[] = '.xltx';
 
         // Test on PC (files with no extension get application/octet-stream)
         //$mime_type[] = 'application/octet-stream';      $extension[] = '.ext';
@@ -891,7 +891,7 @@ 
 
         foreach ($mime_type as $key => & $type) {
             if ($type == $file_type) {
-                $file_name .=  $extension[$key];
+                $file_name .= $extension[$key];
                 break;
             }
         }
@@ -967,12 +967,12 @@ 
         }
 
         // It happens on Linux that $upload_path sometimes doesn't start with '/'
-        if ($upload_path[0] != '/' && substr($base_work_dir,-1,1) != '/') {
+        if ($upload_path[0] != '/' && substr($base_work_dir, -1, 1) != '/') {
             $upload_path = '/'.$upload_path;
         }
 
         if ($upload_path[strlen($upload_path) - 1] == '/') {
-            $upload_path=substr($upload_path, 0, -1);
+            $upload_path = substr($upload_path, 0, -1);
         }
 
         /*	Uncompressing phase */
@@ -984,15 +984,15 @@ 
             - add it to the database
             - parse & change relative html links
         */
-        if (PHP_OS == 'Linux' && ! get_cfg_var('safe_mode') && false) { // *** UGent, changed by OC ***
+        if (PHP_OS == 'Linux' && !get_cfg_var('safe_mode') && false) { // *** UGent, changed by OC ***
             // Shell Method - if this is possible, it gains some speed
-            exec("unzip -d \"".$base_work_dir.$upload_path."/\"".$uploaded_file['name']." " .$uploaded_file['tmp_name']);
+            exec("unzip -d \"".$base_work_dir.$upload_path."/\"".$uploaded_file['name']." ".$uploaded_file['tmp_name']);
         } else {
             // PHP method - slower...
             $save_dir = getcwd();
             chdir($base_work_dir.$upload_path);
             $unzippingState = $zip_file->extract();
-            for ($j=0; $j < count($unzippingState); $j++) {
+            for ($j = 0; $j < count($unzippingState); $j++) {
                 $state = $unzippingState[$j];
 
                 // Fix relative links in html files
@@ -1006,8 +1006,8 @@ 
                         if (is_dir($base_work_dir.$upload_path.'/'.$file)) $filetype = 'folder';
 
                         $safe_file = api_replace_dangerous_char($file);
-                        @rename($base_work_dir.$upload_path.'/'.$file,$base_work_dir.$upload_path.'/'.$safe_file);
-                        set_default_settings($upload_path, $safe_file,$filetype);
+                        @rename($base_work_dir.$upload_path.'/'.$file, $base_work_dir.$upload_path.'/'.$safe_file);
+                        set_default_settings($upload_path, $safe_file, $filetype);
                     }
                 }
 
@@ -1057,7 +1057,7 @@ 
     $zip = new PclZip($uploaded_file['tmp_name']);
 
     // Check the zip content (real size and file extension)
-    $zip_content_array = (array)$zip->listContent();
+    $zip_content_array = (array) $zip->listContent();
 
     $realSize = 0;
     foreach ($zip_content_array as & $this_content) {
@@ -1159,7 +1159,7 @@ 
 function filter_extension(&$filename)
 {
     if (substr($filename, -1) == '/') {
-        return 1;  // Authorize directories
+        return 1; // Authorize directories
     }
     $blacklist = api_get_setting('upload_extensions_list_type');
     if ($blacklist != 'whitelist') { // if = blacklist
@@ -1392,9 +1392,9 @@ 
     $upload_path = str_replace('//', '/', $upload_path);
 
     if ($upload_path == '/') {
-        $upload_path='';
+        $upload_path = '';
     } elseif (!empty($upload_path) && $upload_path[0] != '/') {
-        $upload_path="/$upload_path";
+        $upload_path = "/$upload_path";
     }
 
     $endchar = substr($filename, strlen($filename) - 1, 1);
@@ -1432,7 +1432,7 @@ 
     $img_path_list = array();
 
     if (!$fp = fopen($html_file, 'r')) {
-        return ;
+        return;
     }
 
     // Aearch and store occurences of the <img> tag in an array
@@ -1452,7 +1452,7 @@ 
         $img_tag_list = $matches[0];
     }
 
-    fclose ($fp);
+    fclose($fp);
     unset($buffer);
 
     // Search the image file path from all the <IMG> tag detected
@@ -1551,7 +1551,7 @@ 
 
     if (!is_dir($base_work_dir.$systemFolderName)) {
         $result = mkdir(
-            $base_work_dir . $systemFolderName,
+            $base_work_dir.$systemFolderName,
             api_get_permissions_for_new_directories(),
             true
         );
@@ -1564,7 +1564,7 @@ 
                     WHERE
                         c_id = $course_id AND
                         (
-                            path = '" . Database::escape_string($systemFolderName). "'
+                            path = '".Database::escape_string($systemFolderName)."'
                         )
             ";
 
@@ -1721,7 +1721,7 @@ 
 
     // Fix the image tags
 
-    for ($i = 0, $fileNb = count($original_img_path); $i < $fileNb ; $i++) {
+    for ($i = 0, $fileNb = count($original_img_path); $i < $fileNb; $i++) {
         $replace_what = $original_img_path[$i];
         // We only need the directory and the filename /path/to/file_html_files/missing_file.gif -> file_html_files/missing_file.gif
         $exploded_file_path = explode('/', $new_img_path[$i]);
@@ -1762,7 +1762,7 @@ 
         .'</body>'
         .'</html>';
     if (file_exists($file_path)) {
-        if (!($fp = fopen ($file_path, 'w'))) {
+        if (!($fp = fopen($file_path, 'w'))) {
             return false;
         }
         return fwrite($fp, $file_content);
@@ -1799,7 +1799,7 @@ 
 {
     // Do we need a / or not?
     $added_slash = ($upload_path == '/') ? '' : '/';
-    $folder_id      = DocumentManager::get_document_id(api_get_course_info(), $upload_path);
+    $folder_id = DocumentManager::get_document_id(api_get_course_info(), $upload_path);
     // Build the form
     $form = "<p><strong>".get_lang('MissingImagesDetected')."</strong></p>"
         ."<form method=\"post\" action=\"".api_get_self()."\" enctype=\"multipart/form-data\">"

main/chat/video.php

Spacing +2 added lines, -2 removed lines

@@ -34,8 +34,8 @@
 $idUserLocal = api_get_user_id();
 $userLocal = api_get_user_info($idUserLocal, true);
 $htmlHeadXtra[] = '<script type="text/javascript" src="'
-    . api_get_path(WEB_PATH) . 'web/assets/simpleWebRTC/latest.js'
-    . '"></script>' . "\n";
+    . api_get_path(WEB_PATH).'web/assets/simpleWebRTC/latest.js'
+    . '"></script>'."\n";
 
 $template = new Template();
 $template->assign('room_name', $chatVideo->getRoomName());

src/Chamilo/SettingsBundle/Manager/SettingsManager.php

Spacing +3 added lines, -3 removed lines

@@ -141,7 +141,7 @@ 
             'Institution' => 'Platform',
             'InstitutionUrl' => 'Platform',
             'siteName' => 'Platform',
-            'emailAdministrator' => 'admin',//'emailAdministrator' => 'Platform',
+            'emailAdministrator' => 'admin', //'emailAdministrator' => 'Platform',
             'administratorSurname' => 'admin',
             'administratorTelephone' => 'admin',
             'administratorName' => 'admin',
@@ -252,11 +252,11 @@ 
             'allow_send_message_to_all_platform_users' => 'Tools',
             'message_max_upload_filesize' => 'Tools',
             'use_users_timezone' => 'profile', //'use_users_timezone' => 'Timezones',
-            'timezone_value' => 'platform',//'timezone_value' => 'Timezones',
+            'timezone_value' => 'platform', //'timezone_value' => 'Timezones',
             'allow_user_course_subscription_by_course_admin' => 'Security',
             'show_link_bug_notification' => 'Platform',
             'show_link_ticket_notification' => 'Platform',
-            'course_validation' => 'course',//'course_validation' => 'Platform',
+            'course_validation' => 'course', //'course_validation' => 'Platform',
             'course_validation_terms_and_conditions_url' => 'Platform',
             'sso_authentication' => 'Security',
             'sso_authentication_domain' => 'Security',