diff --git a/include/utils/VtlibUtils.php b/include/utils/VtlibUtils.php index dbf16efb05ff2c524bf4a9bab6c980d7e07767ea..9f8ba17d2438ffd50425cb69d18190a35aad40c5 100644 --- a/include/utils/VtlibUtils.php +++ b/include/utils/VtlibUtils.php @@ -827,4 +827,23 @@ function vtlib_addSettingsLink($linkName, $linkURL, $blockName = false) { return $success; } +/** + * PHP7 support for split function + * split : Case sensitive. + */ +if (!function_exists('split')) { + function split($pattern, $string, $limit = null) { + $regex = '/' . preg_replace('/\//', '\\/', $pattern) . '/'; + return preg_split($regex, $string, $limit); + } + +} + +function php7_compat_ereg($pattern, $str, $ignore_case=false) { + $regex = '/'. preg_replace('/\//', '\\/', $pattern) .'/' . ($ignore_case ? 'i': ''); + return preg_match($regex, $str); +} + +if (!function_exists('ereg')) { function ereg($pattern, $str) { return php7_compat_ereg($pattern, $str); } } +if (!function_exists('eregi')) { function eregi($pattern, $str) { return php7_compat_ereg($pattern, $str, true); } } ?> \ No newline at end of file diff --git a/include/utils/utils.php b/include/utils/utils.php index fc250c377a47f30faf3464479efdc9ba750ccc0b..1ccbf5d6d7f4088c32daee7ab7625e7dbf7ac127 100755 --- a/include/utils/utils.php +++ b/include/utils/utils.php @@ -2322,33 +2322,6 @@ function lower_array(&$string){ $string = strtolower(trim($string)); } -/* PHP 7 support */ -function php7_compat_split($delim, $str, $ignore_case=false) { - $splits = array(); - while ($str) { - $pos = $ignore_case ? stripos($str, $delim) : strpos($str, $delim); - if ($pos !== false) { - $splits[] = substr($str, 0, $pos); - $str = substr($str, $pos + strlen($delim)); - } else { - $splits[] = $str; - $str = false; - } - } - return $splits; -} - -if (!function_exists('split')) { function split($delim, $str) {return php7_compat_split($delim, $str); } } -if (!function_exists('spliti')) { function spliti($delim, $str) {return php7_compat_split($delim, $str, true);}} - -function php7_compat_ereg($pattern, $str, $ignore_case=false) { - $regex = '/'. preg_replace('/\//', '\\/', $pattern) .'/' . ($ignore_case ? 'i': ''); - return preg_match($regex, $str); -} - -if (!function_exists('ereg')) { function ereg($pattern, $str) { return php7_compat_ereg($pattern, $str); } } -if (!function_exists('eregi')) { function eregi($pattern, $str) { return php7_compat_ereg($pattern, $str, true); } } - if (!function_exists('get_magic_quotes_runtime')) { function get_magic_quotes_runtime() { return false; } } if (!function_exists('set_magic_quotes_runtime')) { function set_magic_quotes_runtime($flag) {} } diff --git a/modules/Reports/views/Detail.php b/modules/Reports/views/Detail.php index 08b8fabdf59842fb8da9eb948decd3246924f349..df34ff09e4d4c0e16f03df560ab9623e9cd12bbc 100644 --- a/modules/Reports/views/Detail.php +++ b/modules/Reports/views/Detail.php @@ -66,11 +66,13 @@ class Reports_Detail_View extends Vtiger_Index_View { $primaryModule = $reportModel->getPrimaryModule(); $secondaryModules = $reportModel->getSecondaryModules(); $modulesList = array($primaryModule); - if(stripos($secondaryModules, ':') >= 0){ - $secmodules = split(':', $secondaryModules); - $modulesList = array_merge($modulesList, $secmodules); - }else{ - array_push($modulesList, $secondaryModules); + if(!empty($secondaryModules)){ + if(stripos($secondaryModules, ':') >= 0){ + $secmodules = split(':', $secondaryModules); + $modulesList = array_merge($modulesList, $secmodules); + }else{ + array_push($modulesList, $secondaryModules); + } } $currentUser = Users_Record_Model::getCurrentUserModel(); $userPrivilegesModel = Users_Privileges_Model::getInstanceById($currentUser->getId());