chamilo / chamilo-lms

main/lp/lp_edit_item.php

Spacing +4 added lines, -4 removed lines

@@ -99,7 +99,7 @@ 
 }
 
 if (!empty($gradebook) && $gradebook == 'view') {
-    $interbreadcrumb[] = array (
+    $interbreadcrumb[] = array(
         'url' => '../gradebook/'.$_SESSION['gradebook_dest'],
         'name' => get_lang('ToolGradebook')
     );
@@ -112,7 +112,7 @@ 
 $show_learn_path = true;
 $lp_theme_css = $_SESSION['oLP']->get_theme();
 
-Display::display_header(get_lang('Edit'),'Path');
+Display::display_header(get_lang('Edit'), 'Path');
 $suredel = trim(get_lang('AreYouSureToDeleteJS'));
 
 ?>
@@ -165,8 +165,8 @@ 
 $path_item = isset($_GET['path_item']) ? $_GET['path_item'] : 0;
 $path_item = Database::escape_string($path_item);
 $tbl_doc = Database :: get_course_table(TABLE_DOCUMENT);
-$sql_doc = "SELECT path FROM " . $tbl_doc . "
-            WHERE c_id = $course_id AND id = '". $path_item."' ";
+$sql_doc = "SELECT path FROM ".$tbl_doc."
+            WHERE c_id = $course_id AND id = '".$path_item."' ";
 
 $res_doc = Database::query($sql_doc);
 $path_file = Database::result($res_doc, 0, 0);

main/lp/lp_impress.php

Indentation +1 added lines, -1 removed lines

@@ -36,7 +36,7 @@
     api_get_group_id()
 );
 if (!api_is_allowed_to_edit(null, true) && intval($visibility) == 0 ) {
-     api_not_allowed();
+        api_not_allowed();
 }
 
 if (empty($_SESSION['oLP'])) {

Spacing +5 added lines, -5 removed lines

@@ -35,7 +35,7 @@ 
     null,
     api_get_group_id()
 );
-if (!api_is_allowed_to_edit(null, true) && intval($visibility) == 0 ) {
+if (!api_is_allowed_to_edit(null, true) && intval($visibility) == 0) {
      api_not_allowed();
 }
 
@@ -73,22 +73,22 @@ 
 $html = '';
 $step = 1;
 foreach ($list as $toc) {
-    $x = 1000*$step;
+    $x = 1000 * $step;
     $html .= '<div id="step-'.$step.'" class="step slide" data-x="'.$x.'" data-y="-1500"  >';
     $html .= '<div class="impress-content">';
     $src = $_SESSION['oLP']->get_link('http', $toc['id']);
     if ($toc['type'] !== 'dokeos_chapter') {
         //just showing the src in a iframe ...
         $html .= '<h2>'.$toc['title'].'</h2>';
-        $html .= '<iframe border="0" frameborder="0" style="width:100%;height:600px" src="' . $src . '"></iframe>';
-    }else{
+        $html .= '<iframe border="0" frameborder="0" style="width:100%;height:600px" src="'.$src.'"></iframe>';
+    } else {
         $html .= "<div class='impress-title'>";
         $html .= '<h1>'.$toc['title'].'</h1>';
         $html .= "</div>";
     }
     $html .= "</div>";
     $html .= "</div>";
-    $step ++;
+    $step++;
 }
 
 //Setting the template

Braces +1 added lines, -1 removed lines

@@ -81,7 +81,7 @@
         //just showing the src in a iframe ...
         $html .= '<h2>'.$toc['title'].'</h2>';
         $html .= '<iframe border="0" frameborder="0" style="width:100%;height:600px" src="' . $src . '"></iframe>';
-    }else{
+    } else{
         $html .= "<div class='impress-title'>";
         $html .= '<h1>'.$toc['title'].'</h1>';
         $html .= "</div>";

main/lp/lp_ajax_save_objectives.php

Spacing +4 added lines, -4 removed lines

@@ -28,10 +28,10 @@
         error_log('In xajax_save_objectives('.$lp_id.','.$user_id.','.$view_id.','.$item_id.',"'.(count($objectives) > 0 ? count($objectives) : '').'")', 0);
     }
     $mylp = learnpath::getLpFromSession(api_get_course_id(), $lp_id, $user_id);
-    $mylpi =& $mylp->items[$item_id];
-    if (is_array($objectives) && count($objectives)>0){
-        foreach ($objectives as $index=>$objective){
-            $mylpi->add_objective($index,$objectives[$index]);
+    $mylpi = & $mylp->items[$item_id];
+    if (is_array($objectives) && count($objectives) > 0) {
+        foreach ($objectives as $index=>$objective) {
+            $mylpi->add_objective($index, $objectives[$index]);
         }
         $mylpi->write_objectives_to_db();
     }

main/lp/lp_add_audio.php

Spacing +13 added lines, -13 removed lines

@@ -16,8 +16,8 @@ 
 
 $is_allowed_to_edit = api_is_allowed_to_edit(null, true);
 
-$isStudentView = isset($_REQUEST['isStudentView']) ? (int)$_REQUEST['isStudentView'] : null;
-$learnpath_id = (int)$_REQUEST['lp_id'];
+$isStudentView = isset($_REQUEST['isStudentView']) ? (int) $_REQUEST['isStudentView'] : null;
+$learnpath_id = (int) $_REQUEST['lp_id'];
 $submit = isset($_POST['submit_button']) ? $_POST['submit_button'] : null;
 
 $type = isset($_GET['type']) ? $_GET['type'] : null;
@@ -41,7 +41,7 @@ 
 }
 
 if (!empty($gradebook) && $gradebook == 'view') {
-    $interbreadcrumb[] = array (
+    $interbreadcrumb[] = array(
         'url' => '../gradebook/'.$_SESSION['gradebook_dest'],
         'name' => get_lang('ToolGradebook')
     );
@@ -65,12 +65,12 @@ 
         );
         break;
     default:
-        $interbreadcrumb[]= array('url' => '#', 'name' => get_lang('NewStep'));
+        $interbreadcrumb[] = array('url' => '#', 'name' => get_lang('NewStep'));
         break;
 }
 
 if ($action == 'add_item' && $type == 'document') {
-    $interbreadcrumb[]= array ('url' => '#', 'name' => get_lang('NewDocumentCreated'));
+    $interbreadcrumb[] = array('url' => '#', 'name' => get_lang('NewDocumentCreated'));
 }
 
 // Theme calls.
@@ -86,7 +86,7 @@ 
 $form = new FormValidator(
     'add_audio',
     'post',
-    api_get_self() . '?action=add_audio&id=' . $lp_item_id . '&' . api_get_cidreq().'&lp_id='.$learnpath_id,
+    api_get_self().'?action=add_audio&id='.$lp_item_id.'&'.api_get_cidreq().'&lp_id='.$learnpath_id,
     null,
     array('enctype' => 'multipart/form-data')
 );
@@ -100,8 +100,8 @@ 
     $urlFile = api_get_path(WEB_COURSE_PATH).$courseInfo['path'].'/document/audio/'.$lp_item->audio.'?'.api_get_cidreq();
 
     if (!file_exists($file)) {
-        $file = api_get_path(SYS_COURSE_PATH).$courseInfo['path'].'/document'.$lpPathInfo['dir'] . '/' . $lp_item->audio;
-        $urlFile = api_get_path(WEB_COURSE_PATH).$courseInfo['path'].'/document'.$lpPathInfo['dir'] . '/' . $lp_item->audio.'?'.api_get_cidreq();
+        $file = api_get_path(SYS_COURSE_PATH).$courseInfo['path'].'/document'.$lpPathInfo['dir'].'/'.$lp_item->audio;
+        $urlFile = api_get_path(WEB_COURSE_PATH).$courseInfo['path'].'/document'.$lpPathInfo['dir'].'/'.$lp_item->audio.'?'.api_get_cidreq();
     }
 }
 
@@ -117,10 +117,10 @@ 
 
 $page .= '<div id="doc_form" class="col-md-8">';
 
-$htmlHeadXtra[] = '<script src="' . api_get_path(WEB_LIBRARY_JS_PATH) . 'rtc/RecordRTC.js"></script>';
-$htmlHeadXtra[] = '<script src="' . api_get_path(WEB_LIBRARY_PATH) . 'wami-recorder/recorder.js"></script>';
-$htmlHeadXtra[] = '<script src="' . api_get_path(WEB_LIBRARY_PATH) . 'wami-recorder/gui.js"></script>';
-$htmlHeadXtra[] = '<script type="text/javascript" src="' . api_get_path(WEB_LIBRARY_PATH) . 'swfobject/swfobject.js"></script>';
+$htmlHeadXtra[] = '<script src="'.api_get_path(WEB_LIBRARY_JS_PATH).'rtc/RecordRTC.js"></script>';
+$htmlHeadXtra[] = '<script src="'.api_get_path(WEB_LIBRARY_PATH).'wami-recorder/recorder.js"></script>';
+$htmlHeadXtra[] = '<script src="'.api_get_path(WEB_LIBRARY_PATH).'wami-recorder/gui.js"></script>';
+$htmlHeadXtra[] = '<script type="text/javascript" src="'.api_get_path(WEB_LIBRARY_PATH).'swfobject/swfobject.js"></script>';
 
 $tpl = new Template(null);
 $tpl->assign('unique_file_id', api_get_unique_id());
@@ -141,7 +141,7 @@ 
         Display::getMediaPlayer($file, array('url' => $urlFile)).
         "</div>";
     $form->addElement('label', get_lang('Listen'), $audioPlayer);
-    $url = api_get_path(WEB_CODE_PATH) . 'lp/lp_controller.php?lp_id='.$_SESSION['oLP']->get_id().'&action=add_audio&id='.$lp_item_id.'&delete_file=1&'.api_get_cidreq();
+    $url = api_get_path(WEB_CODE_PATH).'lp/lp_controller.php?lp_id='.$_SESSION['oLP']->get_id().'&action=add_audio&id='.$lp_item_id.'&delete_file=1&'.api_get_cidreq();
     $form->addElement('label', null, Display::url(get_lang('RemoveAudio'), $url, array('class' => 'btn btn-danger')));
 } else {
     $form->addElement('file', 'file');

main/lp/openoffice_document.class.php

Indentation +1 added lines, -1 removed lines

@@ -49,7 +49,7 @@
         // Create the directory
         $result = $this->generate_lp_folder($_course, $this->file_name);
 
-         // Create the directory
+            // Create the directory
         $this->base_work_dir = api_get_path(SYS_COURSE_PATH).$_course['path'].'/document';
         ///learning_path/ppt_dirname directory
         $this->created_dir = substr($result['dir'], 0, strlen($result['dir']) -1);

Doc Comments +2 added lines, -2 removed lines

@@ -186,9 +186,9 @@
 
     /**
      * Get images files from remote host (with webservices)
-     * @param   array $file current ppt file details
+     * @param   string $file current ppt file details
      * @param   string  $size The expected final size of the rendered slides
-     * @return  array images files
+     * @return  string images files
      */
     private function _get_remote_ppt2lp_files($file, $size = null)
     {

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;
         }
         $client = new SoapClient(null, $options);
         $result = '';
@@ -239,7 +239,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)
@@ -272,38 +272,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) {
@@ -342,14 +342,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/lp_ajax_switch_item_toc.php

Spacing +16 added lines, -16 removed lines

@@ -124,22 +124,22 @@
     $coreExit = $myLPI->get_core_exit();
 
     $return .=
-        "olms.lms_lp_id=".$lpId.";" .
-        "olms.lms_item_id=".$newItemId.";" .
-        "olms.lms_old_item_id=".$oldItemId.";" .
-        "olms.lms_initialized=0;" .
-        "olms.lms_view_id=".$viewId.";" .
-        "olms.lms_user_id=".$userId.";" .
-        "olms.next_item=".$newItemId.";" . // This one is very important to replace possible literal strings.
-        "olms.lms_next_item=".$nextItemId.";" .
-        "olms.lms_previous_item=".$previousItemId.";" .
-        "olms.lms_item_type = '".$itemType."';" .
-        "olms.lms_item_credit = '".$credit."';" .
-        "olms.lms_item_lesson_mode = '".$lessonMode."';" .
-        "olms.lms_item_launch_data = '".$launchData."';" .
-        "olms.lms_item_interactions_count = '".$interactionsCount."';" .
-        "olms.lms_item_objectives_count = '".$objectivesCount."';" .
-        "olms.lms_item_core_exit = '".$coreExit."';" .
+        "olms.lms_lp_id=".$lpId.";".
+        "olms.lms_item_id=".$newItemId.";".
+        "olms.lms_old_item_id=".$oldItemId.";".
+        "olms.lms_initialized=0;".
+        "olms.lms_view_id=".$viewId.";".
+        "olms.lms_user_id=".$userId.";".
+        "olms.next_item=".$newItemId.";".// This one is very important to replace possible literal strings.
+        "olms.lms_next_item=".$nextItemId.";".
+        "olms.lms_previous_item=".$previousItemId.";".
+        "olms.lms_item_type = '".$itemType."';".
+        "olms.lms_item_credit = '".$credit."';".
+        "olms.lms_item_lesson_mode = '".$lessonMode."';".
+        "olms.lms_item_launch_data = '".$launchData."';".
+        "olms.lms_item_interactions_count = '".$interactionsCount."';".
+        "olms.lms_item_objectives_count = '".$objectivesCount."';".
+        "olms.lms_item_core_exit = '".$coreExit."';".
         "olms.asset_timer = 0;";
 
     $return .= "update_toc('unhighlight','".$currentItem."');".

main/gradebook/exercise_jump.php

Spacing +5 added lines, -5 removed lines

@@ -22,7 +22,7 @@ 
 $doExerciseUrl = '';
 
 if (isset($_GET['doexercise'])) {
-    $doExerciseUrl = api_get_path(WEB_CODE_PATH) . 'exercise/overview.php?' . http_build_query([
+    $doExerciseUrl = api_get_path(WEB_CODE_PATH).'exercise/overview.php?'.http_build_query([
         'session_id' => $session_id,
         'cidReq' => $cidReq,
         'gradebook' => $gradebook,
@@ -35,14 +35,14 @@ 
 
 // no support for hot potatoes
 if ($type == LINK_HOTPOTATOES) {
-    $doExerciseUrl = api_get_path(WEB_CODE_PATH) . 'exercise/exercice.php?session_id='.$session_id.'&cidReq='.Security::remove_XSS($cidReq);
+    $doExerciseUrl = api_get_path(WEB_CODE_PATH).'exercise/exercice.php?session_id='.$session_id.'&cidReq='.Security::remove_XSS($cidReq);
 }
 
 if (isset($_GET['doexercise'])) {
     header('Location: '.$doExerciseUrl);
     exit;
 } else {
-    $url = api_get_path(WEB_CODE_PATH) . 'exercise/overview.php?session_id='.$session_id.'&cidReq='.Security::remove_XSS($cidReq);
+    $url = api_get_path(WEB_CODE_PATH).'exercise/overview.php?session_id='.$session_id.'&cidReq='.Security::remove_XSS($cidReq);
     if (isset($_GET['gradebook'])) {
         $url .= '&gradebook=view&exerciseId='.intval($_GET['exerciseId']);
 
@@ -58,11 +58,11 @@ 
                         // If the exercise was added once redirect to the LP
                         $firstLp = current($exercise->lpList);
                         if (isset($firstLp['lp_id'])) {
-                            $url = api_get_path(WEB_CODE_PATH) . 'lp/lp_controller.php?' . api_get_cidreq() . '&lp_id=' . $firstLp['lp_id'] . '&action=view&isStudentView=true';
+                            $url = api_get_path(WEB_CODE_PATH).'lp/lp_controller.php?'.api_get_cidreq().'&lp_id='.$firstLp['lp_id'].'&action=view&isStudentView=true';
                         }
                     } else {
                         // If the exercise was added multiple times show the LP list
-                        $url = api_get_path(WEB_CODE_PATH) . 'lp/lp_controller.php?' . api_get_cidreq().'&action=list';
+                        $url = api_get_path(WEB_CODE_PATH).'lp/lp_controller.php?'.api_get_cidreq().'&action=list';
                     }
                 }
             }

main/exercise/exercise_submit_modal.php

Indentation +142 added lines, -142 removed lines

@@ -43,13 +43,13 @@ 
 $learnpath_id = 0;
 
 if (isset($_REQUEST['learnpath_id'])) {
-	$learnpath_id = intval($_REQUEST['learnpath_id']);
+    $learnpath_id = intval($_REQUEST['learnpath_id']);
 }
 
 $learnpath_item_id = 0;
 
 if (isset($_REQUEST['learnpath_item_id'])) {
-	$learnpath_item_id = intval($_REQUEST['learnpath_item_id']);
+    $learnpath_item_id = intval($_REQUEST['learnpath_item_id']);
 }
 
 $_SESSION['hotspot_coord']=array();
@@ -93,7 +93,7 @@ 
 // Getting the options by js
 if (empty($choice_value)) {
 
-	echo "<script>
+    echo "<script>
 		// this works for only radio buttons
 		var f = self.parent.window.document.frm_exercise;
 		var choice_js='';
@@ -122,12 +122,12 @@ 
 		}
 
 	";
-	// IMPORTANT
-	//this is the real redirect function
-	//echo 'window.location.href = "exercise_submit_modal.php?learnpath_id='.$learnpath_id.'&learnpath_item_id='.$learnpath_item_id.'&hotspotcoord="+ hotspotcoord + "&hotspot="+ hotspot + "&choice="+ choice_js + "&exerciseId='.$exerciseId.'&num='.$questionNum.'&exerciseType='.$exerciseType.'&origin='.$origin.'&gradebook='.$gradebook.'";';
+    // IMPORTANT
+    //this is the real redirect function
+    //echo 'window.location.href = "exercise_submit_modal.php?learnpath_id='.$learnpath_id.'&learnpath_item_id='.$learnpath_item_id.'&hotspotcoord="+ hotspotcoord + "&hotspot="+ hotspot + "&choice="+ choice_js + "&exerciseId='.$exerciseId.'&num='.$questionNum.'&exerciseType='.$exerciseType.'&origin='.$origin.'&gradebook='.$gradebook.'";';
     echo ' url = "exercise_submit_modal.php?learnpath_id='.$learnpath_id.'&learnpath_item_id='.$learnpath_item_id.'&hotspotcoord="+ hotspotcoord + "&hotspot="+ hotspot + "&choice="+ choice_js + "&exerciseId='.$exerciseId.'&num='.$questionNum.'&exerciseType='.$exerciseType.'&origin='.$origin.'&gradebook='.$gradebook.'";';
     echo "$('#global-modal .modal-body').load(url);";
-	echo '</script>';
+    echo '</script>';
 
     exit;
 }
@@ -180,12 +180,12 @@ 
 
 // creates a temporary Question object
 if (in_array($questionid, $questionList)) {
-	$objQuestionTmp 	= Question :: read($questionid);
-	$questionName		=$objQuestionTmp->selectTitle();
-	$questionDescription=$objQuestionTmp->selectDescription();
-	$questionWeighting	=$objQuestionTmp->selectWeighting();
-	$answerType			=$objQuestionTmp->selectType();
-	$quesId				=$objQuestionTmp->selectId(); //added by priya saini
+    $objQuestionTmp 	= Question :: read($questionid);
+    $questionName		=$objQuestionTmp->selectTitle();
+    $questionDescription=$objQuestionTmp->selectDescription();
+    $questionWeighting	=$objQuestionTmp->selectWeighting();
+    $answerType			=$objQuestionTmp->selectType();
+    $quesId				=$objQuestionTmp->selectId(); //added by priya saini
 }
 
 $objAnswerTmp=new Answer($questionid);
@@ -208,43 +208,43 @@ 
 $totalScore = 0;
 
 if (!empty($choice_value)) {
-	for ($answerId=1;$answerId <= $nbrAnswers;$answerId++) {
-		$answer            = $objAnswerTmp->selectAnswer($answerId);
-		$answerComment     = $objAnswerTmp->selectComment($answerId);
-		$answerDestination = $objAnswerTmp->selectDestination($answerId);
-
-		$answerCorrect     = $objAnswerTmp->isCorrect($answerId);
-		$answerWeighting   = $objAnswerTmp->selectWeighting($answerId);
-		$numAnswer         = $objAnswerTmp->selectAutoId($answerId);
-
-		//delineation
-		$delineation_cord  = $objAnswerTmp->selectHotspotCoordinates(1);
-		$answer_delineation_destination=$objAnswerTmp->selectDestination(1);
+    for ($answerId=1;$answerId <= $nbrAnswers;$answerId++) {
+        $answer            = $objAnswerTmp->selectAnswer($answerId);
+        $answerComment     = $objAnswerTmp->selectComment($answerId);
+        $answerDestination = $objAnswerTmp->selectDestination($answerId);
+
+        $answerCorrect     = $objAnswerTmp->isCorrect($answerId);
+        $answerWeighting   = $objAnswerTmp->selectWeighting($answerId);
+        $numAnswer         = $objAnswerTmp->selectAutoId($answerId);
+
+        //delineation
+        $delineation_cord  = $objAnswerTmp->selectHotspotCoordinates(1);
+        $answer_delineation_destination=$objAnswerTmp->selectDestination(1);
         if ($dbg_local>0) { error_log(__LINE__.' answerId: '.$answerId.'('.$answerType.') - user delineation_cord: '.$delineation_cord.' - $answer_delineation_destination: '.$answer_delineation_destination,0);}
 
-		switch($answerType) {
-			// for unique answer
-			case UNIQUE_ANSWER :
-				$studentChoice = ($choice_value == $numAnswer)?1:0;
-				if ($studentChoice) {
-					$questionScore	+=$answerWeighting;
-					$totalScore		+=$answerWeighting;
-					$newquestionList[]=$questionid;
-				}
-				break;
-			case HOT_SPOT_DELINEATION :
-			    $studentChoice=$choice[$answerId];
-				if ($studentChoice) {
-					$newquestionList[]=$questionid;
-				}
-				if ($answerId===1) {
-					$questionScore	+=$answerWeighting;
-					$totalScore		+=$answerWeighting;
-					$_SESSION['hotspot_coord'][1]	=$delineation_cord;
-					$_SESSION['hotspot_dest'][1]	=$answer_delineation_destination;
-				}
-				break;
-		}
+        switch($answerType) {
+            // for unique answer
+            case UNIQUE_ANSWER :
+                $studentChoice = ($choice_value == $numAnswer)?1:0;
+                if ($studentChoice) {
+                    $questionScore	+=$answerWeighting;
+                    $totalScore		+=$answerWeighting;
+                    $newquestionList[]=$questionid;
+                }
+                break;
+            case HOT_SPOT_DELINEATION :
+                $studentChoice=$choice[$answerId];
+                if ($studentChoice) {
+                    $newquestionList[]=$questionid;
+                }
+                if ($answerId===1) {
+                    $questionScore	+=$answerWeighting;
+                    $totalScore		+=$answerWeighting;
+                    $_SESSION['hotspot_coord'][1]	=$delineation_cord;
+                    $_SESSION['hotspot_dest'][1]	=$answer_delineation_destination;
+                }
+                break;
+        }
 
 
         if ($answerType == UNIQUE_ANSWER || $answerType == MULTIPLE_ANSWER) {
@@ -341,7 +341,7 @@ 
                         $lp_hotspot=$destination_items[2];
                         $select_question_hotspot=$destination_items[3];
                         $url_hotspot=$destination_items[4];
-                         //echo 'show the feedback';
+                            //echo 'show the feedback';
                     }
                 } elseif($answerId>1) {
                     if ($objAnswerTmp->selectHotspotType($answerId) == 'noerror') {
@@ -398,41 +398,41 @@ 
                 //we send the error
             }
         }
-	}
+    }
 
-	if ($overlap_color) {
-		$overlap_color='green';
+    if ($overlap_color) {
+        $overlap_color='green';
     } else {
-		$overlap_color='red';
+        $overlap_color='red';
     }
-	if ($missing_color) {
-		$missing_color='green';
+    if ($missing_color) {
+        $missing_color='green';
     } else {
-		$missing_color='red';
+        $missing_color='red';
     }
-	if ($excess_color) {
-		$excess_color='green';
+    if ($excess_color) {
+        $excess_color='green';
     } else {
-		$excess_color='red';
+        $excess_color='red';
     }
 
     if (!is_numeric($final_overlap)) {
-    	$final_overlap = 0;
+        $final_overlap = 0;
     }
 
     if (!is_numeric($final_missing)) {
-    	$final_missing = 0;
+        $final_missing = 0;
     }
     if (!is_numeric($final_excess)) {
-    	$final_excess = 0;
+        $final_excess = 0;
     }
 
     if ($final_excess>100) {
-    	$final_excess = 100;
+        $final_excess = 100;
     }
 
 
-	$table_resume = '<table class="data_table" >
+    $table_resume = '<table class="data_table" >
 	<tr class="row_odd" >
 		<td></td>
 		<td ><b>'.get_lang('Requirements').'</b></td>
@@ -457,7 +457,7 @@ 
 		<td><div style="color:'.$missing_color.'">'.(($final_missing < 0)?0:intval($final_missing)).'</div></td>
 	</tr>
 	</table>';
-	//var_dump($final_overlap, $threadhold1 , $final_missing, $threadhold2 , $final_excess, $threadhold3);
+    //var_dump($final_overlap, $threadhold1 , $final_missing, $threadhold2 , $final_excess, $threadhold3);
 }
 $_SESSION['newquestionList'] = $newquestionList;
 
@@ -474,68 +474,68 @@ 
 if ($answerType != HOT_SPOT_DELINEATION) {
     if (!empty($destination)) {
         $item_list = explode('@@',$destination);
-    	//print_R($item_list);
-    	$try = $item_list[0];
-    	$lp = $item_list[1];
-    	$destinationid= $item_list[2];
-    	$url=$item_list[3];
+        //print_R($item_list);
+        $try = $item_list[0];
+        $lp = $item_list[1];
+        $destinationid= $item_list[2];
+        $url=$item_list[3];
     }
-	$table_resume='';
+    $table_resume='';
 } else {
-		$try = $try_hotspot;
-		$lp = $lp_hotspot;
-		$destinationid= $select_question_hotspot;
-		$url=$url_hotspot;
-	if ($organs_at_risk_hit==0 && $wrong_results==false ) {
-		// no error = no oar and no wrong result for delineation
-		//show if no error
-		//echo 'no error';
-		$comment= $answerComment = $objAnswerTmp->selectComment($nbrAnswers);
-		$answerDestination		 = $objAnswerTmp->selectDestination($nbrAnswers);
-
-		//we send the error
-		$destination_items= explode('@@', $answerDestination);
-		$try=$destination_items[1];
-		$lp=$destination_items[2];
-		$destinationid=$destination_items[3];
-		$url=$destination_items[4];
-		$exerciseResult[$questionid] = 1;
-	} else {
-		$exerciseResult[$questionid] = 0;
-	}
+        $try = $try_hotspot;
+        $lp = $lp_hotspot;
+        $destinationid= $select_question_hotspot;
+        $url=$url_hotspot;
+    if ($organs_at_risk_hit==0 && $wrong_results==false ) {
+        // no error = no oar and no wrong result for delineation
+        //show if no error
+        //echo 'no error';
+        $comment= $answerComment = $objAnswerTmp->selectComment($nbrAnswers);
+        $answerDestination		 = $objAnswerTmp->selectDestination($nbrAnswers);
+
+        //we send the error
+        $destination_items= explode('@@', $answerDestination);
+        $try=$destination_items[1];
+        $lp=$destination_items[2];
+        $destinationid=$destination_items[3];
+        $url=$destination_items[4];
+        $exerciseResult[$questionid] = 1;
+    } else {
+        $exerciseResult[$questionid] = 0;
+    }
 }
 
 // the link to retry the question
 if (isset($try) && $try==1) {
-	$num_value_array= (array_keys($questionList, $questionid));
-	$links.= Display :: return_icon('reload.gif', '', array ('style' => 'padding-left:0px;padding-right:5px;')).'<a onclick="SendEx('.$num_value_array[0].');" href="#">'.get_lang('TryAgain').'</a><br /><br />';
+    $num_value_array= (array_keys($questionList, $questionid));
+    $links.= Display :: return_icon('reload.gif', '', array ('style' => 'padding-left:0px;padding-right:5px;')).'<a onclick="SendEx('.$num_value_array[0].');" href="#">'.get_lang('TryAgain').'</a><br /><br />';
 }
 
 // the link to theory (a learning path)
 if (!empty($lp)) {
-	$lp_url= api_get_path(WEB_CODE_PATH) . 'lp/lp_controller.php?'.api_get_cidreq().'&action=view&lp_id='.$lp;
-	$list = new LearnpathList(api_get_user_id());
-	$flat_list = $list->get_flat_list();
-	$links.= Display :: return_icon('theory.gif', '', array ('style' => 'padding-left:0px;padding-right:5px;')).'<a target="_blank" href="'.$lp_url.'">'.get_lang('SeeTheory').'</a><br />';
+    $lp_url= api_get_path(WEB_CODE_PATH) . 'lp/lp_controller.php?'.api_get_cidreq().'&action=view&lp_id='.$lp;
+    $list = new LearnpathList(api_get_user_id());
+    $flat_list = $list->get_flat_list();
+    $links.= Display :: return_icon('theory.gif', '', array ('style' => 'padding-left:0px;padding-right:5px;')).'<a target="_blank" href="'.$lp_url.'">'.get_lang('SeeTheory').'</a><br />';
 }
 $links.='<br />';
 
 // the link to an external website or link
 if (!empty($url)) {
-	$links.= Display :: return_icon('link.gif', '', array ('style' => 'padding-left:0px;padding-right:5px;')).'<a target="_blank" href="'.$url.'">'.get_lang('VisitUrl').'</a><br /><br />';
+    $links.= Display :: return_icon('link.gif', '', array ('style' => 'padding-left:0px;padding-right:5px;')).'<a target="_blank" href="'.$url.'">'.get_lang('VisitUrl').'</a><br /><br />';
 }
 
 // the link to finish the test
 if ($destinationid==-1) {
-	$links.= Display :: return_icon('finish.gif', '', array ('style' => 'width:22px; height:22px; padding-left:0px;padding-right:5px;')).'<a onclick="SendEx(-1);" href="#">'.get_lang('EndActivity').'</a><br /><br />';
+    $links.= Display :: return_icon('finish.gif', '', array ('style' => 'width:22px; height:22px; padding-left:0px;padding-right:5px;')).'<a onclick="SendEx(-1);" href="#">'.get_lang('EndActivity').'</a><br /><br />';
 } else {
-	// the link to other question
-	if (in_array($destinationid,$questionList)) {
-		$objQuestionTmp = Question :: read($destinationid);
-		$questionName=$objQuestionTmp->selectTitle();
-		$num_value_array= (array_keys($questionList, $destinationid));
-		$links.= Display :: return_icon('quiz.gif', '', array ('style' => 'padding-left:0px;padding-right:5px;')).'<a onclick="SendEx('.$num_value_array[0].');" href="#">'.get_lang('GoToQuestion').' '.$num_value_array[0].'</a><br /><br />';
-	}
+    // the link to other question
+    if (in_array($destinationid,$questionList)) {
+        $objQuestionTmp = Question :: read($destinationid);
+        $questionName=$objQuestionTmp->selectTitle();
+        $num_value_array= (array_keys($questionList, $destinationid));
+        $links.= Display :: return_icon('quiz.gif', '', array ('style' => 'padding-left:0px;padding-right:5px;')).'<a onclick="SendEx('.$num_value_array[0].');" href="#">'.get_lang('GoToQuestion').' '.$num_value_array[0].'</a><br /><br />';
+    }
 }
 
 echo '<script>
@@ -552,43 +552,43 @@ 
 </script>';
 
 if ($links!='') {
-	/*echo '<div id="ModalContent" style="padding-bottom:30px;padding-top:10px;padding-left:20px;padding-right:20px;">
+    /*echo '<div id="ModalContent" style="padding-bottom:30px;padding-top:10px;padding-left:20px;padding-right:20px;">
     <a onclick="self.parent.tb_remove();" href="#" style="float:right; margin-top:-10px;">'.api_ucfirst(get_lang('Close')).'</a>';*/
-	echo '<h1><div style="color:#333;">'.get_lang('Feedback').'</div></h1>';
-
-	if ($answerType == HOT_SPOT_DELINEATION) {
-		if ($organs_at_risk_hit > 0) {
-			//$message='<p>'.get_lang('YourDelineation').'</p>';
-			//$message.=$table_resume;
-			$message.='<br />'.get_lang('ResultIs').' <b>'.get_lang('Unacceptable').'</b><br />';
-			//if ($wrong_results) { }
-			$message.='<p style="color:#DC0A0A;"><b>'.get_lang('OARHit').'</b></p>';
-			$message.='<p>'.$comment.'</p>';
-		} else {
-			$message='<p>'.get_lang('YourDelineation').'</p>';
-			$message.=$table_resume;
-			$message.='<br />'.get_lang('ResultIs').' <b>'.$result_comment.'</b><br />';
-			$message.='<p>'.$comment.'</p>';
-		}
-		echo $message;
-	} else {
-		echo '<p>'.$comment.'</p>';
-	}
-	echo '<h3>'.$links.'</h3>';
-	echo '</div>';
-
-	$_SESSION['hot_spot_result']=$message;
-	$_SESSION['hotspot_delineation_result'][$exerciseId][$questionid] = array($message, $exerciseResult[$questionid]);
-	//reseting the exerciseResult variable
-	Session::write('exerciseResult',$exerciseResult);
-
-	//save this variables just in case the exercise loads an LP with other exercise
-	$_SESSION['objExerciseExtra'.$exerciseId] 	 = $_SESSION['objExercise'];
-	$_SESSION['exerciseResultExtra'.$exerciseId] = $_SESSION['exerciseResult'];
-	$_SESSION['questionListExtra'.$exerciseId]	 = $_SESSION['questionList'];
+    echo '<h1><div style="color:#333;">'.get_lang('Feedback').'</div></h1>';
+
+    if ($answerType == HOT_SPOT_DELINEATION) {
+        if ($organs_at_risk_hit > 0) {
+            //$message='<p>'.get_lang('YourDelineation').'</p>';
+            //$message.=$table_resume;
+            $message.='<br />'.get_lang('ResultIs').' <b>'.get_lang('Unacceptable').'</b><br />';
+            //if ($wrong_results) { }
+            $message.='<p style="color:#DC0A0A;"><b>'.get_lang('OARHit').'</b></p>';
+            $message.='<p>'.$comment.'</p>';
+        } else {
+            $message='<p>'.get_lang('YourDelineation').'</p>';
+            $message.=$table_resume;
+            $message.='<br />'.get_lang('ResultIs').' <b>'.$result_comment.'</b><br />';
+            $message.='<p>'.$comment.'</p>';
+        }
+        echo $message;
+    } else {
+        echo '<p>'.$comment.'</p>';
+    }
+    echo '<h3>'.$links.'</h3>';
+    echo '</div>';
+
+    $_SESSION['hot_spot_result']=$message;
+    $_SESSION['hotspot_delineation_result'][$exerciseId][$questionid] = array($message, $exerciseResult[$questionid]);
+    //reseting the exerciseResult variable
+    Session::write('exerciseResult',$exerciseResult);
+
+    //save this variables just in case the exercise loads an LP with other exercise
+    $_SESSION['objExerciseExtra'.$exerciseId] 	 = $_SESSION['objExercise'];
+    $_SESSION['exerciseResultExtra'.$exerciseId] = $_SESSION['exerciseResult'];
+    $_SESSION['questionListExtra'.$exerciseId]	 = $_SESSION['questionList'];
 } else {
-	$questionNum++;
-	echo '<script>
+    $questionNum++;
+    echo '<script>
 			self.parent.window.location.href = "exercise_submit.php?exerciseId='.$exerciseId.'&num='.$questionNum.'&exerciseType='.$exerciseType.'&origin='.$origin.'";
    			//self.parent.tb_remove();
  	 	</script>';

Spacing +136 added lines, -136 removed lines

@@ -52,9 +52,9 @@ 
 	$learnpath_item_id = intval($_REQUEST['learnpath_item_id']);
 }
 
-$_SESSION['hotspot_coord']=array();
-$newquestionList= isset($_SESSION['newquestionList']) ? $_SESSION['newquestionList'] : [];
-$questionList 	= $_SESSION['questionList'];
+$_SESSION['hotspot_coord'] = array();
+$newquestionList = isset($_SESSION['newquestionList']) ? $_SESSION['newquestionList'] : [];
+$questionList = $_SESSION['questionList'];
 
 $exerciseId		= intval($_GET['exerciseId']);
 $exerciseType	= intval($_GET['exerciseType']);
@@ -84,9 +84,9 @@ 
 
 $choice_value = '';
 
-$user_array = substr($user_array,0,-1);
+$user_array = substr($user_array, 0, -1);
 
-if (isset($_GET['choice'])){
+if (isset($_GET['choice'])) {
     $choice_value = intval($_GET['choice']);
 }
 
@@ -133,7 +133,7 @@ 
 }
 
 $choice = array();
-$questionid= $questionList[$questionNum];
+$questionid = $questionList[$questionNum];
 // $choice_value => value of the user selection
 $choice[$questionid] = isset($choice_value) ? $choice_value : null;
 
@@ -150,11 +150,11 @@ 
         $exerciseResult = $choice;
     } else {
         // gets the question ID from $choice. It is the key of the array
-        list($key)=array_keys($choice);
+        list($key) = array_keys($choice);
         // if the user didn't already answer this question
-        if(!isset($exerciseResult[$key])) {
+        if (!isset($exerciseResult[$key])) {
             // stores the user answer into the array
-            $exerciseResult[$key]=$choice[$key];
+            $exerciseResult[$key] = $choice[$key];
         }
     }
 }
@@ -180,26 +180,26 @@ 
 
 // creates a temporary Question object
 if (in_array($questionid, $questionList)) {
-	$objQuestionTmp 	= Question :: read($questionid);
-	$questionName		=$objQuestionTmp->selectTitle();
-	$questionDescription=$objQuestionTmp->selectDescription();
-	$questionWeighting	=$objQuestionTmp->selectWeighting();
-	$answerType			=$objQuestionTmp->selectType();
-	$quesId				=$objQuestionTmp->selectId(); //added by priya saini
+	$objQuestionTmp = Question :: read($questionid);
+	$questionName = $objQuestionTmp->selectTitle();
+	$questionDescription = $objQuestionTmp->selectDescription();
+	$questionWeighting = $objQuestionTmp->selectWeighting();
+	$answerType = $objQuestionTmp->selectType();
+	$quesId = $objQuestionTmp->selectId(); //added by priya saini
 }
 
-$objAnswerTmp=new Answer($questionid);
-$nbrAnswers=$objAnswerTmp->selectNbrAnswers();
+$objAnswerTmp = new Answer($questionid);
+$nbrAnswers = $objAnswerTmp->selectNbrAnswers();
 //echo 'answe_type '.$answerType;echo '<br />';
 
 $choice = $exerciseResult[$questionid];
-$destination=array();
-$comment='';
-$next=1;
+$destination = array();
+$comment = '';
+$next = 1;
 $_SESSION['hotspot_coord'] = array();
 $_SESSION['hotspot_dest'] = array();
 
-$overlap_color = $missing_color = $excess_color=false;
+$overlap_color = $missing_color = $excess_color = false;
 $organs_at_risk_hit = 0;
 $wrong_results = false;
 $hot_spot_load = false;
@@ -208,7 +208,7 @@ 
 $totalScore = 0;
 
 if (!empty($choice_value)) {
-	for ($answerId=1;$answerId <= $nbrAnswers;$answerId++) {
+	for ($answerId = 1; $answerId <= $nbrAnswers; $answerId++) {
 		$answer            = $objAnswerTmp->selectAnswer($answerId);
 		$answerComment     = $objAnswerTmp->selectComment($answerId);
 		$answerDestination = $objAnswerTmp->selectDestination($answerId);
@@ -219,29 +219,29 @@ 
 
 		//delineation
 		$delineation_cord  = $objAnswerTmp->selectHotspotCoordinates(1);
-		$answer_delineation_destination=$objAnswerTmp->selectDestination(1);
-        if ($dbg_local>0) { error_log(__LINE__.' answerId: '.$answerId.'('.$answerType.') - user delineation_cord: '.$delineation_cord.' - $answer_delineation_destination: '.$answer_delineation_destination,0);}
+		$answer_delineation_destination = $objAnswerTmp->selectDestination(1);
+        if ($dbg_local > 0) { error_log(__LINE__.' answerId: '.$answerId.'('.$answerType.') - user delineation_cord: '.$delineation_cord.' - $answer_delineation_destination: '.$answer_delineation_destination, 0); }
 
-		switch($answerType) {
+		switch ($answerType) {
 			// for unique answer
 			case UNIQUE_ANSWER :
-				$studentChoice = ($choice_value == $numAnswer)?1:0;
+				$studentChoice = ($choice_value == $numAnswer) ? 1 : 0;
 				if ($studentChoice) {
-					$questionScore	+=$answerWeighting;
-					$totalScore		+=$answerWeighting;
-					$newquestionList[]=$questionid;
+					$questionScore += $answerWeighting;
+					$totalScore		+= $answerWeighting;
+					$newquestionList[] = $questionid;
 				}
 				break;
 			case HOT_SPOT_DELINEATION :
-			    $studentChoice=$choice[$answerId];
+			    $studentChoice = $choice[$answerId];
 				if ($studentChoice) {
-					$newquestionList[]=$questionid;
+					$newquestionList[] = $questionid;
 				}
-				if ($answerId===1) {
-					$questionScore	+=$answerWeighting;
-					$totalScore		+=$answerWeighting;
-					$_SESSION['hotspot_coord'][1]	=$delineation_cord;
-					$_SESSION['hotspot_dest'][1]	=$answer_delineation_destination;
+				if ($answerId === 1) {
+					$questionScore += $answerWeighting;
+					$totalScore += $answerWeighting;
+					$_SESSION['hotspot_coord'][1] = $delineation_cord;
+					$_SESSION['hotspot_dest'][1] = $answer_delineation_destination;
 				}
 				break;
 		}
@@ -253,27 +253,27 @@ 
                 $destination = $answerDestination;
                 $comment = $answerComment;
             }
-        } elseif($answerType == HOT_SPOT_DELINEATION) {
+        } elseif ($answerType == HOT_SPOT_DELINEATION) {
             if ($next) {
-                if ($dbg_local>0) { error_log(__LINE__.' - next',0);}
+                if ($dbg_local > 0) { error_log(__LINE__.' - next', 0); }
                 $hot_spot_load = true; //apparently the script is called twice
                 $user_answer = $user_array;
-                $_SESSION['exerciseResultCoordinates'][$questionid]=$user_answer; //needed for exercise_result.php
+                $_SESSION['exerciseResultCoordinates'][$questionid] = $user_answer; //needed for exercise_result.php
 
                 // we compare only the delineation not the other points
-                $answer_question	= $_SESSION['hotspot_coord'][1];
-                $answerDestination	= $_SESSION['hotspot_dest'][1];
+                $answer_question = $_SESSION['hotspot_coord'][1];
+                $answerDestination = $_SESSION['hotspot_dest'][1];
 
-                $poly_user 				= convert_coordinates($user_answer,'/');
-                $poly_answer 			= convert_coordinates($answer_question,'|');
-                $max_coord 				= poly_get_max($poly_user,$poly_answer);
+                $poly_user 				= convert_coordinates($user_answer, '/');
+                $poly_answer = convert_coordinates($answer_question, '|');
+                $max_coord 				= poly_get_max($poly_user, $poly_answer);
 
                 if (empty($_GET['hotspot'])) { //no user response
                     $overlap = -2;
                 } else {
-                    $poly_user_compiled 	= poly_compile($poly_user,$max_coord);
-                    $poly_answer_compiled 	= poly_compile($poly_answer,$max_coord);
-                    $poly_results 			= poly_result($poly_answer_compiled,$poly_user_compiled,$max_coord);
+                    $poly_user_compiled = poly_compile($poly_user, $max_coord);
+                    $poly_answer_compiled = poly_compile($poly_answer, $max_coord);
+                    $poly_results = poly_result($poly_answer_compiled, $poly_user_compiled, $max_coord);
 
                     $overlap = $poly_results['both'];
                     $poly_answer_area = $poly_results['s1'];
@@ -283,7 +283,7 @@ 
                 }
 
                 //$overlap = round(polygons_overlap($poly_answer,$poly_user)); //this is an area in pixels
-                if ($dbg_local>0) { error_log(__LINE__.' - Polygons results are '.print_r($poly_results,1),0);}
+                if ($dbg_local > 0) { error_log(__LINE__.' - Polygons results are '.print_r($poly_results, 1), 0); }
                 if ($overlap < 1) {
                     //shortcut to avoid complicated calculations
                     $final_overlap = 0;
@@ -291,27 +291,27 @@ 
                     $final_excess  = 100;
                 } else {
                     // the final overlap is the percentage of the initial polygon that is overlapped by the user's polygon
-                    $final_overlap = round(((float)$overlap / (float)$poly_answer_area)*100);
-                    if ($dbg_local>1) { error_log(__LINE__.' - Final overlap is '.$final_overlap,0);}
+                    $final_overlap = round(((float) $overlap / (float) $poly_answer_area) * 100);
+                    if ($dbg_local > 1) { error_log(__LINE__.' - Final overlap is '.$final_overlap, 0); }
                     // the final missing area is the percentage of the initial polygon that is not overlapped by the user's polygon
                     $final_missing = 100 - $final_overlap;
-                    if ($dbg_local>1) { error_log(__LINE__.' - Final missing is '.$final_missing,0);}
+                    if ($dbg_local > 1) { error_log(__LINE__.' - Final missing is '.$final_missing, 0); }
                     // the final excess area is the percentage of the initial polygon's size that is covered by the user's polygon outside of the initial polygon
-                    $final_excess = round((((float)$poly_user_area-(float)$overlap)/(float)$poly_answer_area)*100);
-                    if ($dbg_local>1) { error_log(__LINE__.' - Final excess is '.$final_excess,0);}
+                    $final_excess = round((((float) $poly_user_area - (float) $overlap) / (float) $poly_answer_area) * 100);
+                    if ($dbg_local > 1) { error_log(__LINE__.' - Final excess is '.$final_excess, 0); }
                 }
 
-                $destination_items= explode('@@', $answerDestination);
+                $destination_items = explode('@@', $answerDestination);
                 $threadhold_total = $destination_items[0];
-                $threadhold_items=explode(';',$threadhold_total);
+                $threadhold_items = explode(';', $threadhold_total);
                 $threadhold1 = $threadhold_items[0]; // overlap
                 $threadhold2 = $threadhold_items[1]; // excess
-                $threadhold3 = $threadhold_items[2];	 //missing
+                $threadhold3 = $threadhold_items[2]; //missing
 
                 // echo $final_overlap.'  '.$threadhold1 .' - '. $final_missing.' '. $threadhold2 .' - '. $final_excess.'  '. $threadhold3;
 
                 // if is delineation
-                if ($answerId===1) {
+                if ($answerId === 1) {
                     //setting colors
                     if ($final_overlap >= $threadhold1) {
                         $overlap_color = true; //echo 'a';
@@ -327,40 +327,40 @@ 
 
                     // if pass
                     //if ($final_overlap>=$threadhold1 && $final_missing<=$threadhold2 && $final_excess<=$threadhold3) {
-                    if ($final_overlap>=$threadhold1 && $final_missing<=$threadhold3 && $final_excess<=$threadhold2) {
-                        $next=1; //go to the oars
-                        $result_comment=get_lang('Acceptable');
+                    if ($final_overlap >= $threadhold1 && $final_missing <= $threadhold3 && $final_excess <= $threadhold2) {
+                        $next = 1; //go to the oars
+                        $result_comment = get_lang('Acceptable');
                     } else {
-                        $next=1; //Go to the oars. If $next =  0 we will show this message: "One (or more) area at risk has been hit" instead of the table resume with the results
+                        $next = 1; //Go to the oars. If $next =  0 we will show this message: "One (or more) area at risk has been hit" instead of the table resume with the results
                         $wrong_results = true;
-                        $result_comment=get_lang('Unacceptable');
-                        $special_comment = $comment=$answerDestination=$objAnswerTmp->selectComment(1);
-                        $answerDestination=$objAnswerTmp->selectDestination(1);
-                        $destination_items= explode('@@', $answerDestination);
-                        $try_hotspot=$destination_items[1];
-                        $lp_hotspot=$destination_items[2];
-                        $select_question_hotspot=$destination_items[3];
-                        $url_hotspot=$destination_items[4];
+                        $result_comment = get_lang('Unacceptable');
+                        $special_comment = $comment = $answerDestination = $objAnswerTmp->selectComment(1);
+                        $answerDestination = $objAnswerTmp->selectDestination(1);
+                        $destination_items = explode('@@', $answerDestination);
+                        $try_hotspot = $destination_items[1];
+                        $lp_hotspot = $destination_items[2];
+                        $select_question_hotspot = $destination_items[3];
+                        $url_hotspot = $destination_items[4];
                          //echo 'show the feedback';
                     }
-                } elseif($answerId>1) {
+                } elseif ($answerId > 1) {
                     if ($objAnswerTmp->selectHotspotType($answerId) == 'noerror') {
-                        if ($dbg_local>0) { error_log(__LINE__.' - answerId is of type noerror',0);}
+                        if ($dbg_local > 0) { error_log(__LINE__.' - answerId is of type noerror', 0); }
                         //type no error shouldn't be treated
                         $next = 1;
                         continue;
                     }
-                    if ($dbg_local>0) { error_log(__LINE__.' - answerId is >1 so we\'re probably in OAR',0);}
+                    if ($dbg_local > 0) { error_log(__LINE__.' - answerId is >1 so we\'re probably in OAR', 0); }
                     //check the intersection between the oar and the user
                     //echo 'user';	print_r($x_user_list);		print_r($y_user_list);
                     //echo 'official';print_r($x_list);print_r($y_list);
                     //$result = get_intersection_data($x_list,$y_list,$x_user_list,$y_user_list);
 
                     //$delineation_cord=$objAnswerTmp->selectHotspotCoordinates($answerId);
-                    $delineation_cord=$objAnswerTmp->selectHotspotCoordinates($answerId); //getting the oars coordinates
+                    $delineation_cord = $objAnswerTmp->selectHotspotCoordinates($answerId); //getting the oars coordinates
 
-                    $poly_answer 			= convert_coordinates($delineation_cord,'|');
-                    $max_coord 				= poly_get_max($poly_user,$poly_answer); //getting max coordinates
+                    $poly_answer = convert_coordinates($delineation_cord, '|');
+                    $max_coord = poly_get_max($poly_user, $poly_answer); //getting max coordinates
                     $test = false;
                     // if ($answerId == 2 ){$test = true;} for test oars
 
@@ -368,9 +368,9 @@ 
                         $overlap = false;
                     } else {
                         //	poly_compile really works tested with gnuplot
-                        $poly_user_compiled	  	= poly_compile($poly_user,$max_coord,$test);//$poly_user is already set when answerid = 1
-                        $poly_answer_compiled 	= poly_compile($poly_answer,$max_coord,$test);
-                        $overlap 			  	= poly_touch($poly_user_compiled, $poly_answer_compiled,$max_coord);
+                        $poly_user_compiled	  	= poly_compile($poly_user, $max_coord, $test); //$poly_user is already set when answerid = 1
+                        $poly_answer_compiled 	= poly_compile($poly_answer, $max_coord, $test);
+                        $overlap = poly_touch($poly_user_compiled, $poly_answer_compiled, $max_coord);
                     }
 
                     if ($overlap == false) {
@@ -378,42 +378,42 @@ 
                         $next = 1;
                         continue;
                     } else {
-                        if ($dbg_local>0) { error_log(__LINE__.' - Overlap is '.$overlap.': OAR hit',0);}
+                        if ($dbg_local > 0) { error_log(__LINE__.' - Overlap is '.$overlap.': OAR hit', 0); }
 
                         $organs_at_risk_hit++;
                         //show the feedback
-                        $next=1;
-                        $comment=$answerDestination=$objAnswerTmp->selectComment($answerId);
-                        $answerDestination=$objAnswerTmp->selectDestination($answerId);
-                        $destination_items= explode('@@', $answerDestination);
-                        $try_hotspot=$destination_items[1];
-                        $lp_hotspot=$destination_items[2];
-                        $select_question_hotspot=$destination_items[3];
-                        $url_hotspot=$destination_items[4];
+                        $next = 1;
+                        $comment = $answerDestination = $objAnswerTmp->selectComment($answerId);
+                        $answerDestination = $objAnswerTmp->selectDestination($answerId);
+                        $destination_items = explode('@@', $answerDestination);
+                        $try_hotspot = $destination_items[1];
+                        $lp_hotspot = $destination_items[2];
+                        $select_question_hotspot = $destination_items[3];
+                        $url_hotspot = $destination_items[4];
                     }
                 }
             } else {
                 // the first delineation feedback
-                if ($dbg_local>0) { error_log(__LINE__.' first',0);}
+                if ($dbg_local > 0) { error_log(__LINE__.' first', 0); }
                 //we send the error
             }
         }
 	}
 
 	if ($overlap_color) {
-		$overlap_color='green';
+		$overlap_color = 'green';
     } else {
-		$overlap_color='red';
+		$overlap_color = 'red';
     }
 	if ($missing_color) {
-		$missing_color='green';
+		$missing_color = 'green';
     } else {
-		$missing_color='red';
+		$missing_color = 'red';
     }
 	if ($excess_color) {
-		$excess_color='green';
+		$excess_color = 'green';
     } else {
-		$excess_color='red';
+		$excess_color = 'red';
     }
 
     if (!is_numeric($final_overlap)) {
@@ -427,7 +427,7 @@ 
     	$final_excess = 0;
     }
 
-    if ($final_excess>100) {
+    if ($final_excess > 100) {
     	$final_excess = 100;
     }
 
@@ -442,26 +442,26 @@ 
 	<tr class="row_even">
 		<td><b>'.get_lang('Overlap').'</b></td>
 		<td>'.get_lang('Min').' '.$threadhold1.'</td>
-		<td><div style="color:'.$overlap_color.'">'.(($final_overlap < 0)?0:intval($final_overlap)).'</div></td>
+		<td><div style="color:'.$overlap_color.'">'.(($final_overlap < 0) ? 0 : intval($final_overlap)).'</div></td>
 	</tr>
 
 	<tr>
 		<td><b>'.get_lang('Excess').'</b></td>
 		<td>'.get_lang('Max').' '.$threadhold2.'</td>
-		<td><div style="color:'.$excess_color.'">'.(($final_excess < 0)?0:intval($final_excess)).'</div></td>
+		<td><div style="color:'.$excess_color.'">'.(($final_excess < 0) ? 0 : intval($final_excess)).'</div></td>
 	</tr>
 
 	<tr class="row_even">
 		<td><b>'.get_lang('Missing').'</b></td>
 		<td>'.get_lang('Max').' '.$threadhold3.'</td>
-		<td><div style="color:'.$missing_color.'">'.(($final_missing < 0)?0:intval($final_missing)).'</div></td>
+		<td><div style="color:'.$missing_color.'">'.(($final_missing < 0) ? 0 : intval($final_missing)).'</div></td>
 	</tr>
 	</table>';
 	//var_dump($final_overlap, $threadhold1 , $final_missing, $threadhold2 , $final_excess, $threadhold3);
 }
 $_SESSION['newquestionList'] = $newquestionList;
 
-$links='';
+$links = '';
 
 if (isset($choice_value) && $choice_value == -1) {
     if ($answerType != HOT_SPOT_DELINEATION) {
@@ -473,32 +473,32 @@ 
 
 if ($answerType != HOT_SPOT_DELINEATION) {
     if (!empty($destination)) {
-        $item_list = explode('@@',$destination);
+        $item_list = explode('@@', $destination);
     	//print_R($item_list);
     	$try = $item_list[0];
     	$lp = $item_list[1];
-    	$destinationid= $item_list[2];
-    	$url=$item_list[3];
+    	$destinationid = $item_list[2];
+    	$url = $item_list[3];
     }
-	$table_resume='';
+	$table_resume = '';
 } else {
 		$try = $try_hotspot;
 		$lp = $lp_hotspot;
-		$destinationid= $select_question_hotspot;
-		$url=$url_hotspot;
-	if ($organs_at_risk_hit==0 && $wrong_results==false ) {
+		$destinationid = $select_question_hotspot;
+		$url = $url_hotspot;
+	if ($organs_at_risk_hit == 0 && $wrong_results == false) {
 		// no error = no oar and no wrong result for delineation
 		//show if no error
 		//echo 'no error';
-		$comment= $answerComment = $objAnswerTmp->selectComment($nbrAnswers);
-		$answerDestination		 = $objAnswerTmp->selectDestination($nbrAnswers);
+		$comment = $answerComment = $objAnswerTmp->selectComment($nbrAnswers);
+		$answerDestination = $objAnswerTmp->selectDestination($nbrAnswers);
 
 		//we send the error
-		$destination_items= explode('@@', $answerDestination);
-		$try=$destination_items[1];
-		$lp=$destination_items[2];
-		$destinationid=$destination_items[3];
-		$url=$destination_items[4];
+		$destination_items = explode('@@', $answerDestination);
+		$try = $destination_items[1];
+		$lp = $destination_items[2];
+		$destinationid = $destination_items[3];
+		$url = $destination_items[4];
 		$exerciseResult[$questionid] = 1;
 	} else {
 		$exerciseResult[$questionid] = 0;
@@ -506,35 +506,35 @@ 
 }
 
 // the link to retry the question
-if (isset($try) && $try==1) {
-	$num_value_array= (array_keys($questionList, $questionid));
-	$links.= Display :: return_icon('reload.gif', '', array ('style' => 'padding-left:0px;padding-right:5px;')).'<a onclick="SendEx('.$num_value_array[0].');" href="#">'.get_lang('TryAgain').'</a><br /><br />';
+if (isset($try) && $try == 1) {
+	$num_value_array = (array_keys($questionList, $questionid));
+	$links .= Display :: return_icon('reload.gif', '', array('style' => 'padding-left:0px;padding-right:5px;')).'<a onclick="SendEx('.$num_value_array[0].');" href="#">'.get_lang('TryAgain').'</a><br /><br />';
 }
 
 // the link to theory (a learning path)
 if (!empty($lp)) {
-	$lp_url= api_get_path(WEB_CODE_PATH) . 'lp/lp_controller.php?'.api_get_cidreq().'&action=view&lp_id='.$lp;
+	$lp_url = api_get_path(WEB_CODE_PATH).'lp/lp_controller.php?'.api_get_cidreq().'&action=view&lp_id='.$lp;
 	$list = new LearnpathList(api_get_user_id());
 	$flat_list = $list->get_flat_list();
-	$links.= Display :: return_icon('theory.gif', '', array ('style' => 'padding-left:0px;padding-right:5px;')).'<a target="_blank" href="'.$lp_url.'">'.get_lang('SeeTheory').'</a><br />';
+	$links .= Display :: return_icon('theory.gif', '', array('style' => 'padding-left:0px;padding-right:5px;')).'<a target="_blank" href="'.$lp_url.'">'.get_lang('SeeTheory').'</a><br />';
 }
-$links.='<br />';
+$links .= '<br />';
 
 // the link to an external website or link
 if (!empty($url)) {
-	$links.= Display :: return_icon('link.gif', '', array ('style' => 'padding-left:0px;padding-right:5px;')).'<a target="_blank" href="'.$url.'">'.get_lang('VisitUrl').'</a><br /><br />';
+	$links .= Display :: return_icon('link.gif', '', array('style' => 'padding-left:0px;padding-right:5px;')).'<a target="_blank" href="'.$url.'">'.get_lang('VisitUrl').'</a><br /><br />';
 }
 
 // the link to finish the test
-if ($destinationid==-1) {
-	$links.= Display :: return_icon('finish.gif', '', array ('style' => 'width:22px; height:22px; padding-left:0px;padding-right:5px;')).'<a onclick="SendEx(-1);" href="#">'.get_lang('EndActivity').'</a><br /><br />';
+if ($destinationid == -1) {
+	$links .= Display :: return_icon('finish.gif', '', array('style' => 'width:22px; height:22px; padding-left:0px;padding-right:5px;')).'<a onclick="SendEx(-1);" href="#">'.get_lang('EndActivity').'</a><br /><br />';
 } else {
 	// the link to other question
-	if (in_array($destinationid,$questionList)) {
+	if (in_array($destinationid, $questionList)) {
 		$objQuestionTmp = Question :: read($destinationid);
-		$questionName=$objQuestionTmp->selectTitle();
-		$num_value_array= (array_keys($questionList, $destinationid));
-		$links.= Display :: return_icon('quiz.gif', '', array ('style' => 'padding-left:0px;padding-right:5px;')).'<a onclick="SendEx('.$num_value_array[0].');" href="#">'.get_lang('GoToQuestion').' '.$num_value_array[0].'</a><br /><br />';
+		$questionName = $objQuestionTmp->selectTitle();
+		$num_value_array = (array_keys($questionList, $destinationid));
+		$links .= Display :: return_icon('quiz.gif', '', array('style' => 'padding-left:0px;padding-right:5px;')).'<a onclick="SendEx('.$num_value_array[0].');" href="#">'.get_lang('GoToQuestion').' '.$num_value_array[0].'</a><br /><br />';
 	}
 }
 
@@ -551,7 +551,7 @@ 
 }
 </script>';
 
-if ($links!='') {
+if ($links != '') {
 	/*echo '<div id="ModalContent" style="padding-bottom:30px;padding-top:10px;padding-left:20px;padding-right:20px;">
     <a onclick="self.parent.tb_remove();" href="#" style="float:right; margin-top:-10px;">'.api_ucfirst(get_lang('Close')).'</a>';*/
 	echo '<h1><div style="color:#333;">'.get_lang('Feedback').'</div></h1>';
@@ -560,15 +560,15 @@ 
 		if ($organs_at_risk_hit > 0) {
 			//$message='<p>'.get_lang('YourDelineation').'</p>';
 			//$message.=$table_resume;
-			$message.='<br />'.get_lang('ResultIs').' <b>'.get_lang('Unacceptable').'</b><br />';
+			$message .= '<br />'.get_lang('ResultIs').' <b>'.get_lang('Unacceptable').'</b><br />';
 			//if ($wrong_results) { }
-			$message.='<p style="color:#DC0A0A;"><b>'.get_lang('OARHit').'</b></p>';
-			$message.='<p>'.$comment.'</p>';
+			$message .= '<p style="color:#DC0A0A;"><b>'.get_lang('OARHit').'</b></p>';
+			$message .= '<p>'.$comment.'</p>';
 		} else {
-			$message='<p>'.get_lang('YourDelineation').'</p>';
-			$message.=$table_resume;
-			$message.='<br />'.get_lang('ResultIs').' <b>'.$result_comment.'</b><br />';
-			$message.='<p>'.$comment.'</p>';
+			$message = '<p>'.get_lang('YourDelineation').'</p>';
+			$message .= $table_resume;
+			$message .= '<br />'.get_lang('ResultIs').' <b>'.$result_comment.'</b><br />';
+			$message .= '<p>'.$comment.'</p>';
 		}
 		echo $message;
 	} else {
@@ -577,10 +577,10 @@ 
 	echo '<h3>'.$links.'</h3>';
 	echo '</div>';
 
-	$_SESSION['hot_spot_result']=$message;
+	$_SESSION['hot_spot_result'] = $message;
 	$_SESSION['hotspot_delineation_result'][$exerciseId][$questionid] = array($message, $exerciseResult[$questionid]);
 	//reseting the exerciseResult variable
-	Session::write('exerciseResult',$exerciseResult);
+	Session::write('exerciseResult', $exerciseResult);
 
 	//save this variables just in case the exercise loads an LP with other exercise
 	$_SESSION['objExerciseExtra'.$exerciseId] 	 = $_SESSION['objExercise'];

main/upload/form.document.php

Spacing +3 added lines, -3 removed lines

@@ -12,8 +12,8 @@ 
  */
 $noPHP_SELF = false;
 $nameTools = get_lang('FileUpload');
-$interbreadcrumb[]= array ("url"=>"../lp/lp_controller.php?action=list", "name"=> get_lang(TOOL_DOCUMENT));
-Display::display_header($nameTools,"Doc");
+$interbreadcrumb[] = array("url"=>"../lp/lp_controller.php?action=list", "name"=> get_lang(TOOL_DOCUMENT));
+Display::display_header($nameTools, "Doc");
 //show the title
 api_display_tool_title($nameTools.$add_group_to_title);
 ?>
@@ -21,7 +21,7 @@ 
 <div id="dynamic_div" style="display:block;margin-left:40%;margin-top:10px;height:50px;">
 </div>
 <div id="upload_form_div" name="form_div" style="display:block;">
-	<form method="POST" action="upload.php" id="upload_form" enctype="multipart/form-data" onsubmit="javascript: myUpload.start('dynamic_div','progressbar_green.gif','<?php echo(get_lang('Uploading', ''));?>','upload_form_div');">
+	<form method="POST" action="upload.php" id="upload_form" enctype="multipart/form-data" onsubmit="javascript: myUpload.start('dynamic_div','progressbar_green.gif','<?php echo(get_lang('Uploading', '')); ?>','upload_form_div');">
 		<input type="hidden" name="curdirpath" value="<?php echo $path; ?>">
 		<input type="hidden" name="tool" value="<?php echo $my_tool; ?>">
 		<input type="file" name="user_file">