Ticket #4103 - Improvements (33512)

inc/utils.inc.php

@@ -445,6 +445,7 @@ function sendMail($sRecipientEmail, $sMailSubject, $sMailBody, $iRecipientID = 0
     
     if ($bResult !== null)
         return $bResult;
+    unset($aAlert['override_result']);
 
     // system alert
     if (!$isDisableAlert) {
@@ -1488,6 +1489,12 @@ function bx_append_url_params ($sUrl, $mixedParams, $bEncodeParams = true, $aIgn
     return $sUrl . $sParams;
 }
 
+function bx_process_url_param($sValue, $sPattern = "/^[\d\w_]+$/")
+{
+    $mixedValue = bx_process_input($sValue);
+    return $mixedValue !== false && preg_match($sPattern, $mixedValue) ? $mixedValue : '';
+}
+
 function bx_rrmdir($directory)
 {
     if (substr($directory,-1) == "/")

modules/boonex/timeline/classes/BxTimelineConfig.php

@@ -927,8 +927,7 @@ class BxTimelineConfig extends BxBaseModNotificationsConfig
 
     public function processParam($sValue, $sPattern = "/^[\d\w_]+$/")
     {
-        $mixedValue = bx_process_input($sValue);
-        return $mixedValue !== false && preg_match($sPattern, $mixedValue) ? $mixedValue : '';
+        return bx_process_url_param($sValue, $sPattern);
     }
 
     public function processParamWithDefault($sValue, $sDefault, $sPattern = "/^[\d\w_]+$/")

studio/builder_page.php

@@ -19,12 +19,12 @@ bx_require_authentication(true);
 $sType = bx_get('type');
 if($sType === false)
     $sType = bx_get('bp_type');
-$sType = $sType !== false ? bx_process_input($sType) : '';
+$sType = $sType !== false ? bx_process_url_param($sType) : '';
 
 $sPage = bx_get('page');
 if($sPage === false)
     $sPage = bx_get('bp_page');
-$sPage = $sPage !== false ? bx_process_input($sPage) : '';
+$sPage = $sPage !== false ? bx_process_url_param($sPage) : '';
 
 $oPage = new BxTemplStudioBuilderPage($sType, $sPage);