From 20d6c995aa6f86b1bb186b7f3b98fc4c2d9ad2c4 Mon Sep 17 00:00:00 2001
From: Julio <gugli100@gmail.com>
Date: Thu, 5 Jul 2018 12:06:26 +0200
Subject: [PATCH] Minor - fix urls, remove my new upload(0) definition

---
 main/lp/lp_build.php          |  2 +-
 main/upload/form.document.php |  4 +---
 main/upload/form.scorm.php    |  2 +-
 main/upload/index.php         | 10 +---------
 main/upload/upload.scorm.php  |  2 +-
 main/upload/upload_ppt.php    | 11 +++++------
 main/upload/upload_word.php   |  5 +----
 7 files changed, 11 insertions(+), 25 deletions(-)

diff --git a/main/lp/lp_build.php b/main/lp/lp_build.php
index c6329b202f..64e2a47163 100755
--- a/main/lp/lp_build.php
+++ b/main/lp/lp_build.php
@@ -44,7 +44,7 @@ if (api_is_in_gradebook()) {
         'name' => get_lang('ToolGradebook'),
     ];
 }
-$interbreadcrumb[] = ['url' => 'lp_controller.php?action=list?'.api_get_cidreq(), 'name' => get_lang('LearningPaths')];
+$interbreadcrumb[] = ['url' => 'lp_controller.php?action=list&'.api_get_cidreq(), 'name' => get_lang('LearningPaths')];
 $interbreadcrumb[] = ['url' => '#', "name" => $learnPath->get_name()];
 
 // Theme calls.
diff --git a/main/upload/form.document.php b/main/upload/form.document.php
index ecdbe494fd..de251f0fda 100755
--- a/main/upload/form.document.php
+++ b/main/upload/form.document.php
@@ -22,9 +22,7 @@ api_display_tool_title($nameTools.$add_group_to_title);
 <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">
         <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">
diff --git a/main/upload/form.scorm.php b/main/upload/form.scorm.php
index e6fe5c7ab5..164ac795eb 100755
--- a/main/upload/form.scorm.php
+++ b/main/upload/form.scorm.php
@@ -41,7 +41,7 @@ function get_zip_files_in_garbage()
  */
 $nameTools = get_lang('FileUpload');
 $interbreadcrumb[] = [
-    "url" => api_get_path(WEB_CODE_PATH)."lp/lp_controller.php?action=list?".api_get_cidreq(),
+    "url" => api_get_path(WEB_CODE_PATH)."lp/lp_controller.php?action=list&".api_get_cidreq(),
     "name" => get_lang("ToolLearnpath"),
 ];
 
diff --git a/main/upload/index.php b/main/upload/index.php
index a3f569fb22..f2724dda1d 100755
--- a/main/upload/index.php
+++ b/main/upload/index.php
@@ -22,7 +22,7 @@ $_course = api_get_course_info();
 
 $htmlHeadXtra[] = "<script>
 function check_unzip() {
-	if(document.upload.unzip.checked){
+	if (document.upload.unzip.checked) {
         document.upload.if_exists[0].disabled=true;
         document.upload.if_exists[1].checked=true;
         document.upload.if_exists[2].disabled=true;
@@ -63,14 +63,6 @@ if (isset($_REQUEST['tool'])) {
  */
 Event::event_access_tool(TOOL_UPLOAD);
 
-/**
- *	Prepare the header.
- */
-$htmlHeadXtra[] = '<script language="javascript" src="../inc/lib/javascript/upload.js" type="text/javascript"></script>';
-$htmlHeadXtra[] = '<script>
-	var myUpload = new upload(0);
-</script>';
-
 /**
  * Now call the corresponding display script, the current script acting like a controller.
  */
diff --git a/main/upload/upload.scorm.php b/main/upload/upload.scorm.php
index 7c5c6b7897..5b91fb8bf4 100755
--- a/main/upload/upload.scorm.php
+++ b/main/upload/upload.scorm.php
@@ -38,5 +38,5 @@ if (api_get_setting('search_enabled') === 'true') {
     }
 }
 
-header('location: ../lp/lp_controller.php?action=list?'.api_get_cidreq());
+header('location: ../lp/lp_controller.php?action=list&'.api_get_cidreq());
 exit;
diff --git a/main/upload/upload_ppt.php b/main/upload/upload_ppt.php
index 85bd80b75a..50b4e5395b 100755
--- a/main/upload/upload_ppt.php
+++ b/main/upload/upload_ppt.php
@@ -1,5 +1,6 @@
 <?php
 /* For licensing terms, see /license.txt */
+
 use Chamilo\CoreBundle\Component\Utils\ChamiloApi;
 
 /**
@@ -12,16 +13,14 @@ use Chamilo\CoreBundle\Component\Utils\ChamiloApi;
  */
 require_once __DIR__.'/../inc/global.inc.php';
 
-$htmlHeadXtra[] = '<script language="javascript" src="../inc/lib/javascript/upload.js" type="text/javascript"></script>';
-$htmlHeadXtra[] = '<script type="text/javascript">
-	var myUpload = new upload(0);
-</script>';
-
 if (isset($_POST['convert'])) {
     $cwdir = getcwd();
     if (isset($_FILES['user_file'])) {
         $allowed_extensions = ['odp', 'sxi', 'ppt', 'pps', 'sxd', 'pptx'];
-        if (in_array(strtolower(pathinfo($_FILES['user_file']['name'], PATHINFO_EXTENSION)), $allowed_extensions)) {
+        if (in_array(
+            strtolower(pathinfo($_FILES['user_file']['name'], PATHINFO_EXTENSION)),
+            $allowed_extensions
+        )) {
             require_once api_get_path(SYS_CODE_PATH).'lp/lp_upload.php';
             if (isset($o_ppt) && $first_item_id != 0) {
                 if (api_get_setting('search_enabled') == 'true') {
diff --git a/main/upload/upload_word.php b/main/upload/upload_word.php
index 867312e998..a3f7c5b332 100755
--- a/main/upload/upload_word.php
+++ b/main/upload/upload_word.php
@@ -1,5 +1,6 @@
 <?php
 /* For licensing terms, see /license.txt */
+
 /**
  * Action controller for the upload process. The display scripts (web forms)
  * redirect
@@ -23,10 +24,6 @@ $form_style = '<style>
 #dynamic_div_waiter_container{float:left;}
 </style>';
 
-$htmlHeadXtra[] = '<script language="javascript" src="../inc/lib/javascript/upload.js" type="text/javascript"></script>';
-$htmlHeadXtra[] = '<script type="text/javascript">
-    var myUpload = new upload(0);
-</script>';
 $htmlHeadXtra[] = $form_style;
 
 if (api_get_setting('search_enabled') == 'true') {