From 13f658360018b91e78e3287cad8997612fa7c75a Mon Sep 17 00:00:00 2001
From: jmontoyaa <gugli100@gmail.com>
Date: Fri, 23 Dec 2016 12:24:03 +0100
Subject: [PATCH] Disable call of WEB_UPLOAD_PATH

---
 main/inc/lib/api.lib.php        | 10 ++++++++--
 plugin/vchamilo/lib/Virtual.php |  2 +-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/main/inc/lib/api.lib.php b/main/inc/lib/api.lib.php
index 4f8c1304db..30fa61e2ea 100644
--- a/main/inc/lib/api.lib.php
+++ b/main/inc/lib/api.lib.php
@@ -824,7 +824,13 @@ function api_get_path($path = '', $configuration = [])
             $paths[$root_web][WEB_HOME_PATH] = api_add_trailing_slash($virtualChamilo[WEB_HOME_PATH]);
             $paths[$root_web][SYS_COURSE_PATH] = api_add_trailing_slash($virtualChamilo[SYS_COURSE_PATH]);
             $paths[$root_web][SYS_UPLOAD_PATH] = api_add_trailing_slash($virtualChamilo[SYS_UPLOAD_PATH]);
-            $paths[$root_web][WEB_UPLOAD_PATH] = api_add_trailing_slash($virtualChamilo[WEB_UPLOAD_PATH]);
+
+            // WEB_UPLOAD_PATH should be handle by apache htaccess in the vhost
+
+            // RewriteEngine On
+            // RewriteRule /app/upload/(.*)$ http://localhost/other/upload/my-chamilo111-net/$1 [QSA,L]
+
+            //$paths[$root_web][WEB_UPLOAD_PATH] = api_add_trailing_slash($virtualChamilo[WEB_UPLOAD_PATH]);
             //$paths[$root_web][REL_PATH] = $virtualChamilo[REL_PATH];
             //$paths[$root_web][REL_COURSE_PATH] = $virtualChamilo[REL_COURSE_PATH];
         }
@@ -1436,7 +1442,7 @@ function api_get_user_info(
                     false,
                     true
                 );
-                if (intval($user_status['user_chat_status']) == 1) {
+                if (@intval($user_status['user_chat_status']) == 1) {
                     $user_online_in_chat = 1;
                 }
             }
diff --git a/plugin/vchamilo/lib/Virtual.php b/plugin/vchamilo/lib/Virtual.php
index 85387257de..3e0c860319 100644
--- a/plugin/vchamilo/lib/Virtual.php
+++ b/plugin/vchamilo/lib/Virtual.php
@@ -100,7 +100,7 @@ class Virtual
                 $data['WEB_HOME_PATH'] = $_configuration['vchamilo_web_root'] . '/var/home/' . $data['slug'];
                 $data['SYS_COURSE_PATH'] = self::addTrailingSlash($coursePath).$data['slug'];
                 $data['SYS_UPLOAD_PATH'] = self::addTrailingSlash($uploadPath).$data['slug'];
-                $data['WEB_UPLOAD_PATH'] = $_configuration['vchamilo_web_root'] . '/var/upload/' . $data['slug'];
+                //$data['WEB_UPLOAD_PATH'] = $_configuration['vchamilo_web_root'] . '/var/upload/' . $data['slug'];
 
                 if (!empty($passwordEncryption)) {
                     $_configuration['password_encryption'] = $passwordEncryption;