copyright and version fixes

[civicrm-core.git] / CRM / Core / Payment / PaymentExpressUtils.php

diff --git a/CRM/Core/Payment/PaymentExpressUtils.php b/CRM/Core/Payment/PaymentExpressUtils.php
index 617c6244cb4a288c69fe53a3ac5e99ff48766cbd..de7aa09ebc160a96123c26717d49887ac9675cdd 100644 (file)
--- a/CRM/Core/Payment/PaymentExpressUtils.php
+++ b/CRM/Core/Payment/PaymentExpressUtils.php
@@ -1,7 +1,7 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.3                                                |
+ | CiviCRM version 4.5                                                |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
@@ -34,48 +34,49 @@
  */
 class CRM_Core_Payment_PaymentExpressUtils {
 
-function _valueXml($element, $value = NULL) {
-  $nl = "\n";
+  static function _valueXml($element, $value = NULL) {
+    $nl = "\n";
 
-  if (is_array($element)) {
-    $xml = '';
-    foreach ($element as $elem => $value) {
-        $xml .= self::_valueXml($elem, $value);
+    if (is_array($element)) {
+      $xml = '';
+      foreach ($element as $elem => $value) {
+          $xml .= self::_valueXml($elem, $value);
+      }
+      return $xml;
     }
-    return $xml;
+    return "<" . $element . ">" . $value . "</" . $element . ">" . $nl;
   }
-  return "<" . $element . ">" . $value . "</" . $element . ">" . $nl;
-}
 
-function _xmlElement($xml, $name) {
-  $value = preg_replace('/.*<' . $name . '[^>]*>(.*)<\/' . $name . '>.*/', '\1', $xml);
-  return $value;
-}
+  static function _xmlElement($xml, $name) {
+    $value = preg_replace('/.*<' . $name . '[^>]*>(.*)<\/' . $name . '>.*/', '\1', $xml);
+    return $value;
+  }
 
-function _xmlAttribute($xml, $name) {
-  $value = preg_replace('/<.*' . $name . '="([^"]*)".*>/', '\1', $xml);
-  return $value != $xml ? $value : NULL;
-}
+  static function _xmlAttribute($xml, $name) {
+    $value = preg_replace('/<.*' . $name . '="([^"]*)".*>/', '\1', $xml);
+    return $value != $xml ? $value : NULL;
+  }
 
-function &_initCURL($query, $url) {
-  $curl = curl_init();
+  static function &_initCURL($query, $url) {
+    $curl = curl_init();
 
-  curl_setopt($curl, CURLOPT_URL, $url);
-  curl_setopt($curl, CURLOPT_FRESH_CONNECT, TRUE);
-  curl_setopt($curl, CURLOPT_POST, TRUE);
-  curl_setopt($curl, CURLOPT_POSTFIELDS, $query);
-  curl_setopt($curl, CURLOPT_POSTFIELDSIZE, 0);
-  curl_setopt($curl, CURLOPT_TIMEOUT, 30);
-  curl_setopt($curl, CURLOPT_RETURNTRANSFER, TRUE);
-  curl_setopt($curl, CURLOPT_FOLLOWLOCATION, FALSE);
-  curl_setopt($curl, CURLOPT_HEADER, 0);
-  curl_setopt($curl, CURLOPT_SSLVERSION, 3);
+    curl_setopt($curl, CURLOPT_URL, $url);
+    curl_setopt($curl, CURLOPT_FRESH_CONNECT, TRUE);
+    curl_setopt($curl, CURLOPT_POST, TRUE);
+    curl_setopt($curl, CURLOPT_POSTFIELDS, $query);
+    curl_setopt($curl, CURLOPT_TIMEOUT, 30);
+    curl_setopt($curl, CURLOPT_RETURNTRANSFER, TRUE);
+    if (ini_get('open_basedir') == '' && ini_get('safe_mode') == 'Off') {
+      curl_setopt($curl, CURLOPT_FOLLOWLOCATION, FALSE);
+    }
+    curl_setopt($curl, CURLOPT_HEADER, 0);
+    curl_setopt($curl, CURLOPT_SSLVERSION, 3);
 
-  if (strtoupper(substr(@php_uname('s'), 0, 3)) === 'WIN') {
-    curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, CRM_Core_BAO_Setting::getItem(CRM_Core_BAO_Setting::SYSTEM_PREFERENCES_NAME, 'verifySSL'));
-    curl_setopt($curl, CURLOPT_SSL_VERIFYHOST, CRM_Core_BAO_Setting::getItem(CRM_Core_BAO_Setting::SYSTEM_PREFERENCES_NAME, 'verifySSL') ? 2 : 0);
+    if (strtoupper(substr(@php_uname('s'), 0, 3)) === 'WIN') {
+      curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, CRM_Core_BAO_Setting::getItem(CRM_Core_BAO_Setting::SYSTEM_PREFERENCES_NAME, 'verifySSL'));
+      curl_setopt($curl, CURLOPT_SSL_VERIFYHOST, CRM_Core_BAO_Setting::getItem(CRM_Core_BAO_Setting::SYSTEM_PREFERENCES_NAME, 'verifySSL') ? 2 : 0);
+    }
+    return $curl;
   }
-  return $curl;
-}
 
 }