Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

PCHR-4346: Fix custom Home URL parsing #28

Merged
merged 1 commit into from
Nov 1, 2018
Merged

PCHR-4346: Fix custom Home URL parsing #28

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CRM/Admin/Page/AJAX.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ public static function getNavigationMenu() {
$smarty = CRM_Core_Smarty::singleton();
$smarty->assign('includeEmail', civicrm_api3('setting', 'getvalue', array('name' => 'includeEmailInName', 'group' => 'Search Preferences')));
print $smarty->fetchWith('CRM/common/navigation.js.tpl', array(
'navigation' => CRM_Core_BAO_Navigation::createNavigation($contactID),
'navigation' => CRM_Core_BAO_Navigation::createNavigation(),
));
}
CRM_Utils_System::civiExit();
Expand Down
65 changes: 41 additions & 24 deletions CRM/Core/BAO/Navigation.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -493,22 +493,7 @@ public static function getMenuName(&$value, &$skipMenuItems) {

$makeLink = FALSE;
if (!empty($url)) {
// Skip processing fully-formed urls
if (substr($url, 0, 4) !== 'http' && $url[0] !== '/' && $url[0] !== '#') {
//CRM-7656 --make sure to separate out url path from url params,
//as we'r going to validate url path across cross-site scripting.
$parsedUrl = parse_url($url);
if (empty($parsedUrl['query'])) {
$parsedUrl['query'] = NULL;
}
if (empty($parsedUrl['fragment'])) {
$parsedUrl['fragment'] = NULL;
}
$url = CRM_Utils_System::url($parsedUrl['path'], $parsedUrl['query'], FALSE, $parsedUrl['fragment'], TRUE);
}
elseif (strpos($url, '&') === FALSE) {
$url = htmlspecialchars($url);
}
$url = self::makeFullyFormedUrl($url);
$makeLink = TRUE;
}

Expand Down Expand Up @@ -581,15 +566,10 @@ public static function getMenuName(&$value, &$skipMenuItems) {
/**
* Create navigation for CiviCRM Admin Menu.
*
* @param int $contactID
* Contact id.
*
* @return string
* returns navigation html
*/
public static function createNavigation($contactID) {
$config = CRM_Core_Config::singleton();

public static function createNavigation() {
$navigation = self::buildNavigation();

if ($navigation) {
Expand All @@ -603,8 +583,7 @@ public static function createNavigation($contactID) {
$homeIcon = '<span class="crm-logo-sm" ></span>';
self::retrieve($homeParams, $homeNav);
if ($homeNav) {
list($path, $q) = explode('?', $homeNav['url']);
$homeURL = CRM_Utils_System::url($path, $q);
$homeURL = self::makeFullyFormedUrl($homeNav['url']);
$homeLabel = $homeNav['label'];
// CRM-6804 (we need to special-case this as we don’t ts()-tag variables)
if ($homeLabel == 'Home') {
Expand All @@ -630,6 +609,44 @@ public static function createNavigation($contactID) {
return $prepandString . $navigation;
}

/**
* Turns relative URLs (like civicrm/foo/bar) into fully-formed
* ones (i.e. example.com/wp-admin?q=civicrm/dashboard).
*
* If the URL is already fully-formed, nothing will be done.
*
* @param string $url
*
* @return string
*/
private static function makeFullyFormedUrl($url) {
if (self::isNotFullyFormedUrl($url)) {
//CRM-7656 --make sure to separate out url path from url params,
//as we'r going to validate url path across cross-site scripting.
$path = parse_url($url, PHP_URL_PATH);
$q = parse_url($url, PHP_URL_QUERY);
$fragment = parse_url($url, PHP_URL_FRAGMENT);
return CRM_Utils_System::url($path, $q, FALSE, $fragment);
}

if (strpos($url, '&amp;') === FALSE) {
return htmlspecialchars($url);
}

return $url;
}

/**
* Checks if the given URL is not fully-formed
*
* @param string $url
*
* @return bool
*/
private static function isNotFullyFormedUrl($url) {
return substr($url, 0, 4) !== 'http' && $url[0] !== '/' && $url[0] !== '#';
}

/**
* Reset navigation for all contacts or a specified contact.
*
Expand Down