Extension ext-admins updated:

[mailer.git] / inc / wrapper-functions.php

diff --git a/inc/wrapper-functions.php b/inc/wrapper-functions.php
index 548aa6562e45c79baa2cdfb4a4375515200bc0ff..70059aca9e0f4a67b1bf53b005d3e2ef5c3ff5d0 100644 (file)
--- a/inc/wrapper-functions.php
+++ b/inc/wrapper-functions.php
@@ -17,7 +17,7 @@
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
  * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
- * For more information visit: http://www.mxchange.org                  *
+ * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
  * it under the terms of the GNU General Public License as published by *
@@ -311,7 +311,7 @@ function isInstalling () {
        // Determine wether we are installing
        if (!isset($GLOBALS['mailer_installing'])) {
                // Check URL (css.php/js.php need this)
-               $GLOBALS['mailer_installing'] = isGetRequestParameterSet('installing');
+               $GLOBALS['mailer_installing'] = isGetRequestElementSet('installing');
        } // END - if
 
        // Return result
@@ -540,9 +540,9 @@ function removeFile ($FQFN) {
 // Wrapper for $_POST['sel']
 function countPostSelection ($element = 'sel') {
        // Is it set?
-       if (isPostRequestParameterSet($element)) {
+       if (isPostRequestElementSet($element)) {
                // Return counted elements
-               return countSelection(postRequestParameter($element));
+               return countSelection(postRequestElement($element));
        } else {
                // Return zero if not found
                return 0;
@@ -1144,7 +1144,7 @@ function sendRawRedirect ($url) {
 
        // check if running on IIS < 6 with CGI-PHP
        if ((isset($_SERVER['SERVER_SOFTWARE'])) && (isset($_SERVER['GATEWAY_INTERFACE'])) &&
-               (strpos($_SERVER['GATEWAY_INTERFACE'], 'CGI') !== false) &&
+               (isInString('CGI', $_SERVER['GATEWAY_INTERFACE'])) &&
                (preg_match('|^Microsoft-IIS/(\d)\.\d$|', trim($_SERVER['SERVER_SOFTWARE']), $matches)) &&
                ($matches[1] < 6)) {
                // Send the IIS header
@@ -2475,7 +2475,7 @@ function ifPostContainsSelections ($element = 'sel') {
        // Do we have cache?
        if (!isset($GLOBALS[__FUNCTION__][$element])) {
                // Determine it
-               $GLOBALS[__FUNCTION__][$element] = ((isPostRequestParameterSet($element)) && (countPostSelection($element) > 0));
+               $GLOBALS[__FUNCTION__][$element] = ((isPostRequestElementSet($element)) && (countPostSelection($element) > 0));
        } // END - if
 
        // Return cache
@@ -2629,10 +2629,10 @@ function createConfigurationTimeSelections ($configEntry, $stamps, $align = 'cen
 // Shortens converting of German comma to Computer's version in POST data
 function convertCommaToDotInPostData ($postEntry) {
        // Read and convert given entry
-       $postValue = convertCommaToDot(postRequestParameter($postEntry));
+       $postValue = convertCommaToDot(postRequestElement($postEntry));
 
        // ... and set it again
-       setPostRequestParameter($postEntry, $postValue);
+       setPostRequestElement($postEntry, $postValue);
 }
 
 // Converts German commas to Computer's version in all entries
@@ -2640,7 +2640,7 @@ function convertCommaToDotInPostDataArray ($postEntries) {
        // Replace german decimal comma with computer decimal dot
        foreach ($postEntries as $entry) {
                // Is the entry there?
-               if (isPostRequestParameterSet($entry)) {
+               if (isPostRequestElementSet($entry)) {
                        // Then convert it
                        convertCommaToDotInPostData($entry);
                } // END - if