Ticket #3567 - Issue with 'Undefined array key "REQUEST_URI"'

inc/utils.inc.php

@@ -571,7 +571,8 @@ function clear_xss($val)
 {
     // HTML Purifier plugin
     global $oHtmlPurifier;
-    if (!isset($oHtmlPurifier) /*&& !$GLOBALS['logged']['admin']*/) {
+    if (!isset($oHtmlPurifier) && !$GLOBALS['logged']['admin']) {
+
         HTMLPurifier_Bootstrap::registerAutoload();
 
         $oConfig = HTMLPurifier_Config::createDefault();
@@ -590,18 +591,10 @@ function clear_xss($val)
             $oConfig->set('HTML.Nofollow', 'true');
         }
 
-        $oConfig->set('Filter.Custom', array (
-            new BxDolHTMLPurifierFilterYouTube(), 
-            new BxDolHTMLPurifierFilterYoutubeIframe(), 
-            new BxDolHTMLPurifierFilterAddBxLinksClass(), 
-            new BxDolHTMLPurifierFilterLocalIframe(),
-            new BxDolHTMLPurifierFilterEmbed(),
-        ));
-   
-        $oConfig->set('Cache.DefinitionImpl', null); // chear cache
+        $oConfig->set('Filter.Custom', array (new BxDolHTMLPurifierFilterYouTube(), new BxDolHTMLPurifierFilterYoutubeIframe(), new BxDolHTMLPurifierFilterAddBxLinksClass(), new BxDolHTMLPurifierFilterLocalIframe()));
+
 	    $oConfig->set('HTML.DefinitionID', 'html5-definitions');
 		$oConfig->set('HTML.DefinitionRev', 1);
-      
 		if ($def = $oConfig->maybeGetRawHTMLDefinition()) {
 		    $def->addElement('section', 'Block', 'Flow', 'Common');
 		    $def->addElement('nav',     'Block', 'Flow', 'Common');
@@ -623,13 +616,12 @@ function clear_xss($val)
 		        'type' => 'Text',
             ));
             $def->addAttribute('a', 'data-profile-id', 'Number');
-            $def->addAttribute('div', 'source', 'Text');
 		}
 
         $oHtmlPurifier = new HTMLPurifier($oConfig);
     }
 
-    //if (!$GLOBALS['logged']['admin'])
+    if (!$GLOBALS['logged']['admin'])
         $val = $oHtmlPurifier->purify($val);
 
     bx_alert('system', 'clear_xss', 0, 0, array('oHtmlPurifier' => $oHtmlPurifier, 'return_data' => &$val));
@@ -1275,7 +1267,9 @@ function bx_get_with_prefix ($sPrefix, $sMethod = false)
 function bx_get_base_url_inline($aParams = array())
 {
     $aBaseLink = parse_url(BX_DOL_URL_ROOT);
-    $sPageLink = (!empty($aBaseLink['scheme']) ? $aBaseLink['scheme'] : 'http') . '://' . $aBaseLink['host'] . (!empty($aBaseLink['port']) ? ':' . $aBaseLink['port'] : '') . $_SERVER['REQUEST_URI'];
+    $sPageLink = (!empty($aBaseLink['scheme']) ? $aBaseLink['scheme'] : 'http') . '://' . $aBaseLink['host'] . (!empty($aBaseLink['port']) ? ':' . $aBaseLink['port'] : '');
+    if(!empty($_SERVER['REQUEST_URI']))
+        $sPageLink .= $_SERVER['REQUEST_URI'];
 
     list($sPageLink, $aPageParams) = bx_get_base_url($sPageLink);