Merge pull request #21274 from mattwire/contributionviewid

[civicrm-core.git] / CRM / Utils / System.php

diff --git a/CRM/Utils/System.php b/CRM/Utils/System.php
index 5c27f998d451fb88c75aaf7b1cb3e8b67a14932f..b445a04e09481abb0b1c7cebb4d8f483460d7e31 100644 (file)
--- a/CRM/Utils/System.php
+++ b/CRM/Utils/System.php
@@ -281,6 +281,43 @@ class CRM_Utils_System {
     return $url;
   }
 
+  /**
+   * Return the Notification URL for Payments.
+   *
+   * @param string $path
+   *   The path being linked to, such as "civicrm/add".
+   * @param array|string $query
+   *   A query string to append to the link, or an array of key-value pairs.
+   * @param bool $absolute
+   *   Whether to force the output to be an absolute link (beginning with a
+   *   URI-scheme such as 'http:'). Useful for links that will be displayed
+   *   outside the site, such as in an RSS feed.
+   * @param string $fragment
+   *   A fragment identifier (named anchor) to append to the link.
+   * @param bool $htmlize
+   *   Whether to encode special html characters such as &.
+   * @param bool $frontend
+   *   This link should be to the CMS front end (applies to WP & Joomla).
+   * @param bool $forceBackend
+   *   This link should be to the CMS back end (applies to WP & Joomla).
+   *
+   * @return string
+   *   The Notification URL.
+   */
+  public static function getNotifyUrl(
+    $path = NULL,
+    $query = NULL,
+    $absolute = FALSE,
+    $fragment = NULL,
+    $htmlize = TRUE,
+    $frontend = FALSE,
+    $forceBackend = FALSE
+  ) {
+    $config = CRM_Core_Config::singleton();
+    $query = self::makeQueryString($query);
+    return $config->userSystem->getNotifyUrl($path, $query, $absolute, $fragment, $frontend, $forceBackend, $htmlize);
+  }
+
   /**
    * Generates an extern url.
    *
@@ -629,7 +666,7 @@ class CRM_Utils_System {
       );
     }
 
-    if ($key !== $siteKey) {
+    if (!hash_equals($siteKey, $key)) {
       return self::authenticateAbort(
         "ERROR: Invalid key value sent. " . $docAdd . "\n",
         $abort
@@ -1828,32 +1865,6 @@ class CRM_Utils_System {
     return $sid;
   }
 
-  /**
-   * @deprecated
-   * Determine whether this system is deployed using version control.
-   *
-   * Normally sites would tune their php error settings to prevent deprecation
-   * notices appearing on a live site. However, on some systems the user
-   * does not have control over this setting. Sites with version-controlled
-   * deployments are unlikely to be in a situation where they cannot alter their
-   * php error level reporting so we can trust that the are able to set them
-   * to suppress deprecation / php error level warnings if appropriate but
-   * in order to phase in deprecation warnings we originally chose not to
-   * show them on sites who might not be able to set their error_level in
-   * a way that is appropriate to their site.
-   *
-   * @return bool
-   */
-  public static function isDevelopment() {
-    CRM_Core_Error::deprecatedWarning('isDevelopment() is deprecated. Set your php error_reporting or MySQL settings appropriately instead.');
-    static $cache = NULL;
-    if ($cache === NULL) {
-      global $civicrm_root;
-      $cache = file_exists("{$civicrm_root}/.svn") || file_exists("{$civicrm_root}/.git");
-    }
-    return $cache;
-  }
-
   /**
    * Is in upgrade mode.
    *