chamilo / chamilo-lms

main/lp/scorm.class.php

Spacing +19 added lines, -19 removed lines

@@ -393,7 +393,7 @@ 
                 $path = '';
                 $type = 'dir';
                 if (isset($this->resources[$item['identifierref']])) {
-                    $oRes =& $this->resources[$item['identifierref']];
+                    $oRes = & $this->resources[$item['identifierref']];
                     $path = @$oRes->get_path();
                     if (!empty($path)) {
                         $temptype = $oRes->get_scorm_type();
@@ -444,7 +444,7 @@ 
                 $item['parameters'] = Database::escape_string($item['parameters']);
 
                 $sql = "INSERT INTO $new_lp_item (c_id, lp_id,item_type,ref,title, path,min_score,max_score, $field_add parent_item_id,previous_item_id,next_item_id, prerequisite,display_order,launch_data, parameters)
-                        VALUES ($courseId, $lp_id, '$type', '$identifier', '$title', '$path' , 0, $max_score, $value_add $parent, $previous, 0, '$prereq', ".$item['rel_order'] .", '".$item['datafromlms']."', '".$item['parameters']."' )";
+                        VALUES ($courseId, $lp_id, '$type', '$identifier', '$title', '$path' , 0, $max_score, $value_add $parent, $previous, 0, '$prereq', ".$item['rel_order'].", '".$item['datafromlms']."', '".$item['parameters']."' )";
 
                 Database::query($sql);
                 if ($this->debug > 1) { error_log('New LP - In import_manifest(), inserting item : '.$sql, 0); }
@@ -478,7 +478,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) {
@@ -487,7 +487,7 @@ 
                             }
                         }
                     }
-                    $body_to_index = $all_specific_terms .' '. $title;
+                    $body_to_index = $all_specific_terms.' '.$title;
                     $ic_slide->addValue("content", $body_to_index);
                     // TODO: Add a comment to say terms separated by commas.
                     $courseid = api_get_course_id();
@@ -497,7 +497,7 @@ 
                         SE_COURSE_ID => $courseid,
                         SE_TOOL_ID => TOOL_LEARNPATH,
                         SE_DATA => array('lp_id' => $lp_id, 'lp_item'=> $previous, 'document_id' => ''), // TODO: Unify with other lp types.
-                        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);
@@ -543,7 +543,7 @@ 
     public function import_package($zip_file_info, $current_dir = '', $courseInfo = array())
     {
         if ($this->debug > 0) {
-            error_log('In scorm::import_package('.print_r($zip_file_info,true).',"'.$current_dir.'") method', 0);
+            error_log('In scorm::import_package('.print_r($zip_file_info, true).',"'.$current_dir.'") method', 0);
         }
 
         $courseInfo = empty($courseInfo) ? api_get_course_info() : $courseInfo;
@@ -554,7 +554,7 @@ 
         $zip_file_name = $zip_file_info['name'];
 
         if ($this->debug > 1) {
-            error_log('New LP - import_package() - zip file path = ' . $zip_file_path . ', zip file name = ' . $zip_file_name, 0);
+            error_log('New LP - import_package() - zip file path = '.$zip_file_path.', zip file name = '.$zip_file_name, 0);
         }
 
         $course_rel_dir = api_get_course_path($courseInfo['code']).'/scorm'; // scorm dir web path starting from /courses
@@ -562,7 +562,7 @@ 
         $current_dir = api_replace_dangerous_char(trim($current_dir)); // Current dir we are in, inside scorm/
 
         if ($this->debug > 1) {
-            error_log( 'New LP - import_package() - current_dir = ' . $current_dir, 0);
+            error_log('New LP - import_package() - current_dir = '.$current_dir, 0);
         }
 
         // Get name of the zip file without the extension.
@@ -570,7 +570,7 @@ 
         $file_info = pathinfo($zip_file_name);
         $filename = $file_info['basename'];
         $extension = $file_info['extension'];
-        $file_base_name = str_replace('.'.$extension,'',$filename); // Filename without its extension.
+        $file_base_name = str_replace('.'.$extension, '', $filename); // Filename without its extension.
         $this->zipname = $file_base_name; // Save for later in case we don't have a title.
 
         if ($this->debug > 1) { error_log("New LP - base file name is : ".$file_base_name, 0); }
@@ -616,7 +616,7 @@ 
         $slash_count = substr_count($shortest_path, '/');
         foreach ($manifest_list as $manifest_path) {
             $tmp_slash_count = substr_count($manifest_path, '/');
-            if ($tmp_slash_count<$slash_count) {
+            if ($tmp_slash_count < $slash_count) {
                 $shortest_path = $manifest_path;
                 $slash_count = $tmp_slash_count;
             }
@@ -625,7 +625,7 @@ 
         $this->subdir .= '/'.dirname($shortest_path); // Do not concatenate because already done above.
         $manifest = $shortest_path;
         if ($this->debug > 1) { error_log('New LP - Package type is now '.$package_type, 0); }
-        if ($package_type== '') {
+        if ($package_type == '') {
             // && defined('CHECK_FOR_SCORM') && CHECK_FOR_SCORM)
             if ($this->debug > 1) { error_log('New LP - Package type is empty', 0); }
 
@@ -650,8 +650,8 @@ 
             $new_dir = '/'.$new_dir;
         }
 
-        if ($new_dir[strlen($new_dir)-1] == '/') {
-            $new_dir = substr($new_dir,0,-1);
+        if ($new_dir[strlen($new_dir) - 1] == '/') {
+            $new_dir = substr($new_dir, 0, -1);
         }
 
         /* Uncompressing phase */
@@ -692,7 +692,7 @@ 
                     if ($file != '.' && $file != '..') {
                         $filetype = 'file';
 
-                        if (is_dir($course_sys_dir . $new_dir . $file)) {
+                        if (is_dir($course_sys_dir.$new_dir.$file)) {
                             $filetype = 'folder';
                         }
 
@@ -721,7 +721,7 @@ 
                                     }
                                 }
                             }
-                            @rename($course_sys_dir.$new_dir.$file,$course_sys_dir.$new_dir.$safe_file);
+                            @rename($course_sys_dir.$new_dir.$file, $course_sys_dir.$new_dir.$safe_file);
                             if ($this->debug >= 1) { error_log('New LP - Renaming '.$course_sys_dir.$new_dir.$file.' to '.$course_sys_dir.$new_dir.$safe_file, 0); }
                         }
                     }
@@ -908,7 +908,7 @@ 
         if ($this->debug > 0) { error_log('In scorm::get_res_path('.$id.') method', 0); }
         $path = '';
         if (isset($this->resources[$id])) {
-            $oRes =& $this->resources[$id];
+            $oRes = & $this->resources[$id];
             $path = @$oRes->get_path();
         }
         return $path;
@@ -924,7 +924,7 @@ 
         if ($this->debug > 0) { error_log('In scorm::get_res_type('.$id.') method', 0); }
         $type = '';
         if (isset($this->resources[$id])) {
-            $oRes =& $this->resources[$id];
+            $oRes = & $this->resources[$id];
             $temptype = $oRes->get_scorm_type();
             if (!empty($temptype)) {
                 $type = $temptype;
@@ -943,9 +943,9 @@ 
         $title = '';
         if (isset($this->manifest['organizations']['default'])) {
             $title = $this->organizations[$this->manifest['organizations']['default']]->get_name();
-        } elseif (count($this->organizations)==1) {
+        } elseif (count($this->organizations) == 1) {
             // This will only get one title but so we don't need to know the index.
-            foreach($this->organizations as $id => $value) {
+            foreach ($this->organizations as $id => $value) {
                 $title = $this->organizations[$id]->get_name();
                 break;
             }

main/lp/scorm_api.php

Spacing +31 added lines, -31 removed lines

@@ -25,7 +25,7 @@ 
 
 require_once __DIR__.'/../inc/global.inc.php';
 
-$file   = (empty($_SESSION['file'])?'':$_SESSION['file']);
+$file = (empty($_SESSION['file']) ? '' : $_SESSION['file']);
 /** @var learnpath $oLP */
 $oLP = unserialize($_SESSION['lpobject']);
 /** @var learnpathItem $oItem */
@@ -41,7 +41,7 @@ 
 
 header('Content-type: text/javascript');
 
-?>var scorm_logs=<?php echo ((empty($oLP->scorm_debug) or (!api_is_course_admin() && !api_is_platform_admin()) )?'0':'3');?>; //debug log level for SCORM. 0 = none, 1=light, 2=a lot, 3=all - displays logs in log frame
+?>var scorm_logs=<?php echo ((empty($oLP->scorm_debug) or (!api_is_course_admin() && !api_is_platform_admin())) ? '0' : '3'); ?>; //debug log level for SCORM. 0 = none, 1=light, 2=a lot, 3=all - displays logs in log frame
 var lms_logs = 0; //debug log level for LMS actions. 0=none, 1=light, 2=a lot, 3=all
 
 // API Object initialization (eases access later on)
@@ -144,25 +144,25 @@ 
 olms.statusSignalReceived = 0;
 
 // Strictly scorm variables
-olms.score=<?php echo $oItem->get_score();?>;
-olms.max='<?php echo $oItem->get_max();?>';
-olms.min='<?php echo $oItem->get_min();?>';
-olms.lesson_status='<?php echo $oItem->get_status();?>';
-olms.session_time='<?php echo $oItem->get_scorm_time('js');?>';
-olms.suspend_data = '<?php echo $oItem->get_suspend_data();?>';
-olms.lesson_location = '<?php echo $oItem->get_lesson_location();?>';
-olms.total_time = '<?php echo $oItem->get_scorm_time('js');?>';
-olms.mastery_score = '<?php echo $oItem->get_mastery_score();?>';
+olms.score=<?php echo $oItem->get_score(); ?>;
+olms.max='<?php echo $oItem->get_max(); ?>';
+olms.min='<?php echo $oItem->get_min(); ?>';
+olms.lesson_status='<?php echo $oItem->get_status(); ?>';
+olms.session_time='<?php echo $oItem->get_scorm_time('js'); ?>';
+olms.suspend_data = '<?php echo $oItem->get_suspend_data(); ?>';
+olms.lesson_location = '<?php echo $oItem->get_lesson_location(); ?>';
+olms.total_time = '<?php echo $oItem->get_scorm_time('js'); ?>';
+olms.mastery_score = '<?php echo $oItem->get_mastery_score(); ?>';
 olms.launch_data = '<?php echo $oItem->get_launch_data(); ?>';
-olms.max_time_allowed = '<?php echo $oItem->get_max_time_allowed();?>';
-olms.interactions = new Array(<?php echo $oItem->get_interactions_js_array();?>);
+olms.max_time_allowed = '<?php echo $oItem->get_max_time_allowed(); ?>';
+olms.interactions = new Array(<?php echo $oItem->get_interactions_js_array(); ?>);
 olms.item_objectives = new Array();
 olms.info_lms_item = new Array();
 
 // Chamilo internal variables (not SCORM)
 // olms.saved_lesson_status = 'not attempted';
-olms.lms_lp_id = <?php echo $oLP->get_id();?>;
-olms.lms_item_id = <?php echo $oItem->get_id();?>;
+olms.lms_lp_id = <?php echo $oLP->get_id(); ?>;
+olms.lms_item_id = <?php echo $oItem->get_id(); ?>;
 olms.lms_initialized = 0;
 // switch_finished indicates if the switch process is finished (if it has gone
 // through LMSInitialize() for the new item. Until then, all LMSSetValue()
@@ -171,26 +171,26 @@ 
 olms.switch_finished = 0;
 
 //olms.lms_total_lessons = <?php echo $oLP->get_total_items_count(); ?>;
-//olms.lms_complete_lessons = <?php echo $oLP->get_complete_items_count();?>;
-//olms.lms_progress_bar_mode = '<?php echo $oLP->progress_bar_mode;?>';
+//olms.lms_complete_lessons = <?php echo $oLP->get_complete_items_count(); ?>;
+//olms.lms_progress_bar_mode = '<?php echo $oLP->progress_bar_mode; ?>';
 //if(lms_progress_bar_mode == ''){lms_progress_bar_mode='%';}
 
-olms.lms_view_id = '<?php echo $oLP->get_view();?>';
+olms.lms_view_id = '<?php echo $oLP->get_view(); ?>';
 if(olms.lms_view_id == ''){ olms.lms_view_id = 1;}
-olms.lms_user_id = '<?php echo $userId;?>';
-olms.lms_next_item = '<?php echo $oLP->get_next_item_id();?>';
-olms.lms_previous_item = '<?php echo $oLP->get_previous_item_id();?>';
-olms.lms_lp_type = '<?php echo $oLP->get_type();?>';
-olms.lms_item_type = '<?php echo $oItem->get_type();?>';
-olms.lms_item_credit = '<?php echo $oItem->get_credit();?>';
-olms.lms_item_lesson_mode = '<?php echo $oItem->get_lesson_mode();?>';
-olms.lms_item_launch_data = '<?php echo addslashes($oItem->get_launch_data());?>';
-olms.lms_item_core_exit = '<?php echo $oItem->get_core_exit();?>';
+olms.lms_user_id = '<?php echo $userId; ?>';
+olms.lms_next_item = '<?php echo $oLP->get_next_item_id(); ?>';
+olms.lms_previous_item = '<?php echo $oLP->get_previous_item_id(); ?>';
+olms.lms_lp_type = '<?php echo $oLP->get_type(); ?>';
+olms.lms_item_type = '<?php echo $oItem->get_type(); ?>';
+olms.lms_item_credit = '<?php echo $oItem->get_credit(); ?>';
+olms.lms_item_lesson_mode = '<?php echo $oItem->get_lesson_mode(); ?>';
+olms.lms_item_launch_data = '<?php echo addslashes($oItem->get_launch_data()); ?>';
+olms.lms_item_core_exit = '<?php echo $oItem->get_core_exit(); ?>';
 olms.lms_course_id = '<?php echo $oLP->get_course_int_id(); ?>';
 olms.lms_session_id = '<?php echo api_get_session_id(); ?>';
 olms.lms_course_code = '<?php echo $oLP->getCourseCode(); ?>';
 olms.lms_course_id =  '<?php echo $oLP->get_course_int_id(); ?>';
-<?php echo $oLP->get_items_details_as_js('olms.lms_item_types');?>
+<?php echo $oLP->get_items_details_as_js('olms.lms_item_types'); ?>
 
 // Following definition of cmi.core.score.raw in SCORM 1.2, "LMS should
 // initialize this to an empty string ("") upon initial launch of a SCO. The
@@ -227,8 +227,8 @@ 
     logit_scorm('Other SCORM calls are shown in orange.', 1);
     logit_lms('To add new messages to these logs, use logit_lms() or logit_scorm().');
 
-    olms.info_lms_item[0] = '<?php echo $oItem->get_id();?>';
-    olms.info_lms_item[1] = '<?php echo $oItem->get_id();?>';
+    olms.info_lms_item[0] = '<?php echo $oItem->get_id(); ?>';
+    olms.info_lms_item[1] = '<?php echo $oItem->get_id(); ?>';
 
     $("#content_id").load(function() {
         logit_lms('#content_id load event starts');
@@ -499,7 +499,7 @@ 
         result = 'id,score,status';
     } else if(param == 'cmi.objectives._count'){
     // ---- cmi.objectives._count
-        //result='<?php echo $oItem->get_view_count();?>';
+        //result='<?php echo $oItem->get_view_count(); ?>';
         result = olms.item_objectives.length;
     } else if(param.substring(0,15)== 'cmi.objectives.'){
         var myres = '';

main/lp/lp_move_item.php

Spacing +9 added lines, -9 removed lines

@@ -17,7 +17,7 @@ 
 
 /* Header and action code */
 $htmlHeadXtra[] = '<script>'.
-$_SESSION['oLP']->get_js_dropdown_array() .
+$_SESSION['oLP']->get_js_dropdown_array().
 "
     function load_cbo(id) {
         if (!id) {
@@ -41,13 +41,13 @@ 
         $('#previous').selectpicker('refresh');
     }
 " .
-"\n" .
-'$().ready(function() {'."\n" .
-  'if ($(\'#previous\')) {'."\n" .
+"\n".
+'$().ready(function() {'."\n".
+  'if ($(\'#previous\')) {'."\n".
     'if(\'parent is\'+$(\'#idParent\').val()) {'.
-      'load_cbo($(\'#idParent\').val());'."\n" .
-  '}}'."\n" .
-'});</script>'."\n" ;
+      'load_cbo($(\'#idParent\').val());'."\n".
+  '}}'."\n".
+'});</script>'."\n";
 
 /* Constants and variables */
 
@@ -81,11 +81,11 @@ 
 /* SHOWING THE ADMIN TOOLS */
 
 if (isset($_SESSION['gradebook'])) {
-    $gradebook=	$_SESSION['gradebook'];
+    $gradebook = $_SESSION['gradebook'];
 }
 
 if (!empty($gradebook) && $gradebook == 'view') {
-    $interbreadcrumb[] = array (
+    $interbreadcrumb[] = array(
         'url' => '../gradebook/'.$_SESSION['gradebook_dest'],
         'name' => get_lang('ToolGradebook')
     );

main/lp/openoffice_document.class.php

Spacing +30 added lines, -30 removed lines

@@ -58,9 +58,9 @@ 
         ///learning_path/ppt_dirname directory
         $this->created_dir = $result['dir'];
         if (substr($this->created_dir, -1, 1) == '/') {
-            $this->file_path = $this->created_dir . api_replace_dangerous_char($file['name']);
+            $this->file_path = $this->created_dir.api_replace_dangerous_char($file['name']);
         } else {
-            $this->file_path = $this->created_dir . '/' . api_replace_dangerous_char($file['name']);
+            $this->file_path = $this->created_dir.'/'.api_replace_dangerous_char($file['name']);
         }
 
         //var_dump($this->file_name, $this->file_path, $this->base_work_dir, $this->created_dir);
@@ -104,18 +104,18 @@ 
             $perm = api_get_setting('permissions_for_new_files');
 
             if (IS_WINDOWS_OS) { // IS_WINDOWS_OS has been defined in main_api.lib.php
-                $converter_path = str_replace('/', '\\', api_get_path(SYS_PATH) . 'main/inc/lib/ppt2png');
-                $class_path = $converter_path . ';' . $converter_path . '/jodconverter-2.2.2.jar;' . $converter_path . '/jodconverter-cli-2.2.2.jar';
+                $converter_path = str_replace('/', '\\', api_get_path(SYS_PATH).'main/inc/lib/ppt2png');
+                $class_path = $converter_path.';'.$converter_path.'/jodconverter-2.2.2.jar;'.$converter_path.'/jodconverter-cli-2.2.2.jar';
                 //$cmd = 'java -cp "'.$class_path.'" DokeosConverter';
-                $cmd = 'java -Dfile.encoding=UTF-8 -cp "' . $class_path . '" DokeosConverter';
+                $cmd = 'java -Dfile.encoding=UTF-8 -cp "'.$class_path.'" DokeosConverter';
             } else {
-                $converter_path = api_get_path(SYS_PATH) . 'main/inc/lib/ppt2png';
+                $converter_path = api_get_path(SYS_PATH).'main/inc/lib/ppt2png';
                 //$class_path = '-cp .:jodconverter-2.2.1.jar:jodconverter-cli-2.2.1.jar';
                 $class_path = ' -Dfile.encoding=UTF-8 -cp .:jodconverter-2.2.2.jar:jodconverter-cli-2.2.2.jar';
-                $cmd = 'cd ' . $converter_path . ' && java ' . $class_path . ' DokeosConverter';
+                $cmd = 'cd '.$converter_path.' && java '.$class_path.' DokeosConverter';
             }
 
-            $cmd .= ' -p ' . api_get_setting('service_ppt2lp', 'port');
+            $cmd .= ' -p '.api_get_setting('service_ppt2lp', 'port');
             // Call to the function implemented by child.
             $cmd .= $this->add_command_parameters();
             // To allow openoffice to manipulate docs.
@@ -124,7 +124,7 @@ 
             @chmod($this->base_work_dir.$this->file_path, 0777);
 
             $locale = $this->original_locale; // TODO: Improve it because we're not sure this locale is present everywhere.
-            putenv('LC_ALL=' . $locale);
+            putenv('LC_ALL='.$locale);
 
             $files = array();
             $return = 0;
@@ -150,12 +150,12 @@ 
             $result = $this->_get_remote_ppt2lp_files($file, $size);
             $result = unserialize($result);
             // Save remote images to server
-            chmod($this->base_work_dir . $this->created_dir, api_get_permissions_for_new_directories());
+            chmod($this->base_work_dir.$this->created_dir, api_get_permissions_for_new_directories());
             if (!empty($result['images'])) {
                 foreach ($result['images'] as $image => $img_data) {
                     $image_path = $this->base_work_dir.$this->created_dir;
-                    @file_put_contents($image_path . '/' . $image, base64_decode($img_data));
-                    @chmod($image_path . '/' . $image, 0777);
+                    @file_put_contents($image_path.'/'.$image, base64_decode($img_data));
+                    @chmod($image_path.'/'.$image, 0777);
                 }
             }
 
@@ -199,7 +199,7 @@ 
         $uri = '';
         $result = preg_match('/^([a-zA-Z0-9]*):\/\/([^\/]*)\//', $ppt2lp_host, $matches);
         if ($result) {
-            $uri = $matches[1] . '://' . $matches[2] . '/';
+            $uri = $matches[1].'://'.$matches[2].'/';
         } else {
             $uri = $ppt2lp_host;
         }
@@ -218,7 +218,7 @@ 
             'compression' => SOAP_COMPRESSION_ACCEPT | SOAP_COMPRESSION_GZIP | 9,
         );
         if (substr($ppt2lp_host, 0, 5) === 'https') {
-            $options['ssl_method'] =  SOAP_SSL_METHOD_TLS;
+            $options['ssl_method'] = SOAP_SSL_METHOD_TLS;
             // If using SSL, please note that *not* supporting the SSLv2
             // (broken in terms of security), the server tends to generate
             // the following issue:
@@ -243,7 +243,7 @@ 
             //error_log('['.time().'] Calling wsConvertPpt webservice on ' . $ppt2lp_host);
             $result = $client->__call('wsConvertPpt', array('pptData' => $params));
         } catch (Exception $e) {
-            error_log('['.time().'] Chamilo SOAP call error: ' . $e->getMessage());
+            error_log('['.time().'] Chamilo SOAP call error: '.$e->getMessage());
         }
         // Make sure we destroy the SOAP client as it may generate SSL connection
         // binding issue (if using SSL)
@@ -276,38 +276,38 @@ 
         $ppt2lpHost = api_get_setting('service_ppt2lp', 'host');
         $permissionFile = api_get_permissions_for_new_files();
         $permissionFolder = api_get_permissions_for_new_directories();
-        if (file_exists($this->base_work_dir . '/' . $this->created_dir)) {
+        if (file_exists($this->base_work_dir.'/'.$this->created_dir)) {
 
             return $ids;
         }
 
         if ($ppt2lpHost == 'localhost') {
             if (IS_WINDOWS_OS) { // IS_WINDOWS_OS has been defined in main_api.lib.php
-                $converterPath = str_replace('/', '\\', api_get_path(SYS_PATH) . 'main/inc/lib/ppt2png');
-                $classPath = $converterPath . ';' . $converterPath . '/jodconverter-2.2.2.jar;' . $converterPath . '/jodconverter-cli-2.2.2.jar';
-                $cmd = 'java -Dfile.encoding=UTF-8 -jar "' . $classPath . '/jodconverter-2.2.2.jar"';
+                $converterPath = str_replace('/', '\\', api_get_path(SYS_PATH).'main/inc/lib/ppt2png');
+                $classPath = $converterPath.';'.$converterPath.'/jodconverter-2.2.2.jar;'.$converterPath.'/jodconverter-cli-2.2.2.jar';
+                $cmd = 'java -Dfile.encoding=UTF-8 -jar "'.$classPath.'/jodconverter-2.2.2.jar"';
             } else {
-                $converterPath = api_get_path(SYS_PATH) . 'main/inc/lib/ppt2png';
+                $converterPath = api_get_path(SYS_PATH).'main/inc/lib/ppt2png';
                 $classPath = ' -Dfile.encoding=UTF-8 -jar jodconverter-cli-2.2.2.jar';
-                $cmd = 'cd ' . $converterPath . ' && java ' . $classPath . ' ';
+                $cmd = 'cd '.$converterPath.' && java '.$classPath.' ';
             }
 
-            $cmd .= ' -p ' . api_get_setting('service_ppt2lp', 'port');
+            $cmd .= ' -p '.api_get_setting('service_ppt2lp', 'port');
             // Call to the function implemented by child.
-            $cmd .= ' "' . $this->base_work_dir . '/' . $this->file_path . '"  "' . $this->base_work_dir . '/' . $this->created_dir . '"';
+            $cmd .= ' "'.$this->base_work_dir.'/'.$this->file_path.'"  "'.$this->base_work_dir.'/'.$this->created_dir.'"';
             // To allow openoffice to manipulate docs.
             @chmod($this->base_work_dir, $permissionFolder);
-            @chmod($this->base_work_dir . '/' . $this->file_path, $permissionFile);
+            @chmod($this->base_work_dir.'/'.$this->file_path, $permissionFile);
 
             $locale = $this->original_locale; // TODO: Improve it because we're not sure this locale is present everywhere.
-            putenv('LC_ALL=' . $locale);
+            putenv('LC_ALL='.$locale);
 
             $files = array();
             $return = 0;
             $shell = exec($cmd, $files, $return);
             // TODO: Chown is not working, root keep user privileges, should be www-data
-            @chown($this->base_work_dir . '/' . $this->created_dir, 'www-data');
-            @chmod($this->base_work_dir . '/' . $this->created_dir, $permissionFile);
+            @chown($this->base_work_dir.'/'.$this->created_dir, 'www-data');
+            @chmod($this->base_work_dir.'/'.$this->created_dir, $permissionFile);
 
             if ($return != 0) { // If the java application returns an error code.
                 switch ($return) {
@@ -346,14 +346,14 @@ 
             */
         }
 
-        if (file_exists($this->base_work_dir . '/' . $this->created_dir)) {
+        if (file_exists($this->base_work_dir.'/'.$this->created_dir)) {
 
             // Register Files to Document tool
             $ids[] = add_document(
                 $_course,
-                '/' . $this->created_dir,
+                '/'.$this->created_dir,
                 'file',
-                filesize($this->base_work_dir . '/' . $this->created_dir),
+                filesize($this->base_work_dir.'/'.$this->created_dir),
                 $convertedTitle,
                 sprintf(
                     get_lang('FileConvertedFromXToY'),

main/lp/aicc_hacp.php

Spacing +3 added lines, -3 removed lines

@@ -57,7 +57,7 @@ 
 //$_user							= $_SESSION['_user'];
 $file = Session::read('file');
 $oLP = unserialize(Session::read('lpobject'));
-$oItem =& $oLP->items[$oLP->current];
+$oItem = & $oLP->items[$oLP->current];
 if (!is_object($oItem)) {
     error_log('New LP - aicc_hacp - Could not load oItem item', 0);
     exit;
@@ -71,8 +71,8 @@ 
     'evaluation' => array(),
     'student_data' => array(),
 );
-$convert_enc = array('%25','%0D','%0A','%09','%20','%2D','%2F','%3B','%3F','%7B','%7D','%7C','%5C','%5E','%7E','%5B','%5D','%60','%23','%3E','%3C','%22');
-$convert_dec = array('%',"\r","\n","\t",' ','-','/',';','?','{','}','|','\\','^','~','[',']','`','#','>','<','"');
+$convert_enc = array('%25', '%0D', '%0A', '%09', '%20', '%2D', '%2F', '%3B', '%3F', '%7B', '%7D', '%7C', '%5C', '%5E', '%7E', '%5B', '%5D', '%60', '%23', '%3E', '%3C', '%22');
+$convert_dec = array('%', "\r", "\n", "\t", ' ', '-', '/', ';', '?', '{', '}', '|', '\\', '^', '~', '[', ']', '`', '#', '>', '<', '"');
 $crlf = "\r\n";
 //$tab = "\t";
 $tab = "";

main/admin/course_request_rejected.php

Spacing +1 added lines, -1 removed lines

@@ -87,7 +87,7 @@
     $from = intval($from);
     $number_of_items = intval($number_of_items);
     $column = intval($column);
-    $direction = !in_array(strtolower(trim($direction)), ['asc','desc']) ? 'asc' : $direction;
+    $direction = !in_array(strtolower(trim($direction)), ['asc', 'desc']) ? 'asc' : $direction;
 
     $sql = "SELECT
                 id AS col0,

main/inc/lib/image.lib.php

Spacing +19 added lines, -19 removed lines

@@ -114,7 +114,7 @@ 
             return false;
         }
         $this->path = $path;
-        $this->set_image_wrapper();  //Creates image obj
+        $this->set_image_wrapper(); //Creates image obj
     }
 
     abstract function set_image_wrapper();
@@ -156,7 +156,7 @@ 
         if ($this->debug) error_log('Image::set_image_wrapper loaded');
         try {
             if (file_exists($this->path)) {
-                $this->image     = new Imagick($this->path);
+                $this->image = new Imagick($this->path);
 
                 if ($this->image) {
                     $this->fill_image_info(); //Fills height, width and type
@@ -164,7 +164,7 @@ 
             } else {
                 if ($this->debug) error_log('Image::image does not exist');
             }
-        } catch(ImagickException $e) {
+        } catch (ImagickException $e) {
             if ($this->debug) error_log($e->getMessage());
         }
     }
@@ -185,7 +185,7 @@ 
 
 	public function get_image_size()
     {
-		$imagesize = array('width'=>0,'height'=>0);
+		$imagesize = array('width'=>0, 'height'=>0);
 	    if ($this->image_validated) {
             $imagesize = $this->image->getImageGeometry();
 	    }
@@ -202,8 +202,8 @@ 
             $height = $thumbh;
         } else {
             $scale  = ($this->width > 0 && $this->height > 0) ? min($thumbw / $this->width, $thumbh / $this->height) : 0;
-            $width  = (int)($this->width * $scale);
-            $height = (int)($this->height * $scale);
+            $width  = (int) ($this->width * $scale);
+            $height = (int) ($this->height * $scale);
         }
 		$result = $this->image->resizeImage($width, $height, $this->filter, 1);
 		$this->width  = $thumbw;
@@ -249,7 +249,7 @@ 
 		$result = false;
 		try {
 		    $result = $this->image->writeImage($file);
-		} catch(ImagickException $e) {
+		} catch (ImagickException $e) {
             if ($this->debug) error_log($e->getMessage());
         }
 
@@ -310,9 +310,9 @@ 
 
     public function get_image_size()
     {
-        $return_array = array('width'=>0,'height'=>0);
+        $return_array = array('width'=>0, 'height'=>0);
         if ($this->image_validated) {
-	        $return_array = array('width'=>$this->width,'height'=>$this->height);
+	        $return_array = array('width'=>$this->width, 'height'=>$this->height);
         }
         return $return_array;
 	}
@@ -320,7 +320,7 @@ 
     public function fill_image_info()
     {
     	if (file_exists($this->path)) {
-	        $image_info     = getimagesize($this->path);
+	        $image_info = getimagesize($this->path);
 			$this->width    = $image_info[0];
 			$this->height   = $image_info[1];
 			$this->type     = $image_info[2];
@@ -340,11 +340,11 @@ 
                 $height = $thumbh;
             } else {
                 $scale = min($thumbw / $this->width, $thumbh / $this->height);
-                $width = (int)($this->width * $scale);
-                $height = (int)($this->height * $scale);
+                $width = (int) ($this->width * $scale);
+                $height = (int) ($this->height * $scale);
             }
-			$deltaw = (int)(($thumbw - $width) / 2);
-			$deltah = (int)(($thumbh - $height) / 2);
+			$deltaw = (int) (($thumbw - $width) / 2);
+			$deltah = (int) (($thumbh - $height) / 2);
 			$dst_img = @ImageCreateTrueColor($thumbw, $thumbh);
             		@imagealphablending($dst_img, false);
 		        @imagesavealpha($dst_img, true);
@@ -359,8 +359,8 @@ 
                 $height = $thumbh;
             } else {
                 $scale = ($this->width > 0 && $this->height > 0) ? min($thumbw / $this->width, $thumbh / $this->height) : 0;
-                $width  = (int)($this->width * $scale);
-                $height = (int)($this->height * $scale);
+                $width  = (int) ($this->width * $scale);
+                $height = (int) ($this->height * $scale);
             }
 			$deltaw = 0;
 			$deltah = 0;
@@ -418,7 +418,7 @@ 
 	public function send_image($file = '', $compress = -1, $convert_file_to = null)
     {
 	    if (!$this->image_validated) return false;
-        $compress = (int)$compress;
+        $compress = (int) $compress;
         $type = $this->type;
         if (!empty($convert_file_to) && in_array($convert_file_to, $this->allowed_extensions)) {
             $type = $convert_file_to;
@@ -462,11 +462,11 @@ 
          * so that we can use black (0,0,0) as transparent, which is what
          * the image is filled with when created.
          */
-        $transparent = imagecolorallocate($dest_img, 0,0,0);
+        $transparent = imagecolorallocate($dest_img, 0, 0, 0);
         imagealphablending($dest_img, false);
         imagesavealpha($dest_img, true);
         imagecolortransparent($dest_img, $transparent);
-        imagecopy($dest_img, $this->bg, 0,0, 0, 0,imagesx($this->bg), imagesx($this->bg));
+        imagecopy($dest_img, $this->bg, 0, 0, 0, 0, imagesx($this->bg), imagesx($this->bg));
         imagefilter($dest_img, IMG_FILTER_GRAYSCALE);
         $this->bg = $dest_img;
 

main/webservices/additional_webservices.php

Spacing +17 added lines, -17 removed lines

@@ -28,7 +28,7 @@ 
     }
     $fileData = $pptData['file_data'];
     $dataInfo = pathinfo($pptData['file_name']);
-    $fileName =  basename($pptData['file_name'], '.' . $dataInfo['extension']);
+    $fileName = basename($pptData['file_name'], '.'.$dataInfo['extension']);
     $fullFileName = $pptData['file_name'];
     $size = $pptData['service_ppt2lp_size'];
     $w = '800';
@@ -38,8 +38,8 @@ 
     }
 
     $tempArchivePath = api_get_path(SYS_ARCHIVE_PATH);
-    $tempPath = $tempArchivePath . 'wsConvert/' . $fileName . '/';
-    $tempPathNewFiles = $tempArchivePath . 'wsConvert/' . $fileName . '-n/';
+    $tempPath = $tempArchivePath.'wsConvert/'.$fileName.'/';
+    $tempPathNewFiles = $tempArchivePath.'wsConvert/'.$fileName.'-n/';
 
     $oldumask = umask(0);
     //$perms = api_get_permissions_for_new_directories();
@@ -49,13 +49,13 @@ 
     pptConverterDirectoriesCreate($tempPath, $tempPathNewFiles, $fileName, $perms);
 
     $file = base64_decode($fileData);
-    file_put_contents($tempPath . $fullFileName, $file);
+    file_put_contents($tempPath.$fullFileName, $file);
 
     $cmd = pptConverterGetCommandBaseParams();
-    $cmd .= ' -w ' . $w . ' -h ' . $h . ' -d oogie "' . $tempPath . $fullFileName.'"  "' . $tempPathNewFiles . $fileName . '.html"';
+    $cmd .= ' -w '.$w.' -h '.$h.' -d oogie "'.$tempPath.$fullFileName.'"  "'.$tempPathNewFiles.$fileName.'.html"';
 
     //$perms = api_get_permissions_for_new_files();
-    chmod($tempPathNewFiles . $fileName, $perms);
+    chmod($tempPathNewFiles.$fileName, $perms);
 
     $files = array();
     $return = 0;
@@ -67,7 +67,7 @@ 
         if (is_array($files) && !empty($files)) {
             foreach ($files as $file) {
                 $imageData = explode('||', $file);
-                $images[$imageData[1]] = base64_encode(file_get_contents($tempPathNewFiles . $fileName . '/' . $imageData[1]));
+                $images[$imageData[1]] = base64_encode(file_get_contents($tempPathNewFiles.$fileName.'/'.$imageData[1]));
             }
         }
         $data = array(
@@ -93,7 +93,7 @@ 
  */
 function deleteDirectory($directoryPath)
 {
-    $files = array_diff(scandir($directoryPath), array('.','..'));
+    $files = array_diff(scandir($directoryPath), array('.', '..'));
     foreach ($files as $file) {
         if (is_dir("$directoryPath/$file")) {
             deleteDirectory("$directoryPath/$file");
@@ -121,8 +121,8 @@ 
     if (!is_dir($tempPathNewFiles)) {
         mkdir($tempPathNewFiles, $perms, true);
     }
-    if (!is_dir($tempPathNewFiles . $fileName)) {
-        mkdir($tempPathNewFiles . $fileName, $perms, true);
+    if (!is_dir($tempPathNewFiles.$fileName)) {
+        mkdir($tempPathNewFiles.$fileName, $perms, true);
     }
 }
 
@@ -133,16 +133,16 @@ 
 function pptConverterGetCommandBaseParams()
 {
     if (IS_WINDOWS_OS) { // IS_WINDOWS_OS has been defined in main_api.lib.php
-        $converterPath = str_replace('/', '\\', api_get_path(SYS_PATH) . 'main/inc/lib/ppt2png');
-        $classPath = $converterPath . ';' . $converterPath . '/jodconverter-2.2.2.jar;' . $converterPath . '/jodconverter-cli-2.2.2.jar';
-        $cmd = 'java -Dfile.encoding=UTF-8 -cp "' . $classPath . '" DokeosConverter';
+        $converterPath = str_replace('/', '\\', api_get_path(SYS_PATH).'main/inc/lib/ppt2png');
+        $classPath = $converterPath.';'.$converterPath.'/jodconverter-2.2.2.jar;'.$converterPath.'/jodconverter-cli-2.2.2.jar';
+        $cmd = 'java -Dfile.encoding=UTF-8 -cp "'.$classPath.'" DokeosConverter';
     } else {
-        $converterPath = api_get_path(SYS_PATH) . 'main/inc/lib/ppt2png';
+        $converterPath = api_get_path(SYS_PATH).'main/inc/lib/ppt2png';
         $classPath = ' -Dfile.encoding=UTF-8 -cp .:jodconverter-2.2.2.jar:jodconverter-cli-2.2.2.jar';
-        $cmd = 'cd ' . $converterPath . ' && java ' . $classPath . ' DokeosConverter';
+        $cmd = 'cd '.$converterPath.' && java '.$classPath.' DokeosConverter';
     }
 
-    $cmd .= ' -p ' . api_get_setting('service_ppt2lp', 'port');
+    $cmd .= ' -p '.api_get_setting('service_ppt2lp', 'port');
     return $cmd;
 }
 
@@ -151,7 +151,7 @@ 
 $webCodePath = api_get_path(WEB_CODE_PATH);
 $options = array(
     'uri' => $webPath,
-    'location' => $webCodePath . 'webservices/additional_webservices.php'
+    'location' => $webCodePath.'webservices/additional_webservices.php'
 );
 
 $soapServer = new SoapServer(NULL, $options);

main/webservices/api/v2.php

Spacing +2 added lines, -2 removed lines

@@ -163,8 +163,8 @@
             $restResponse->setData($data);
             break;
         case Rest::SAVE_COURSE_NOTEBOOK:
-            $title = !empty($_POST['title'])? $_POST['title'] : null;
-            $text = !empty($_POST['text'])? $_POST['text'] : null;
+            $title = !empty($_POST['title']) ? $_POST['title'] : null;
+            $text = !empty($_POST['text']) ? $_POST['text'] : null;
             $data = $restApi->saveCourseNotebook($title, $text);
             $restResponse->setData($data);
             break;