X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=functions%2Fglobal.php;h=1faeac33917879d79387f97a244b9800fbe273da;hb=aa84daced451fe171b6b606939dba8df6bcab26c;hp=6b7e39e6390d25ab47efedff9c44e588a314d3da;hpb=242342d03ac5665d149af59dd450b7257e140964;p=squirrelmail.git diff --git a/functions/global.php b/functions/global.php index 6b7e39e6..1faeac33 100644 --- a/functions/global.php +++ b/functions/global.php @@ -1,143 +1,789 @@ $value) { - if (is_array($array["$index"])) { - sqstripslashes($array["$index"]); - } - else { - $array["$index"] = stripslashes($value); + if(count($array) > 0) { + foreach ($array as $index=>$value) { + if (is_array($array[$index])) { + sqstripslashes($array[$index]); + } + else { + $array[$index] = stripslashes($value); + } } } } +/** + * Squelch error output to screen (only) for the given function. + * If the SquirrelMail debug mode SM_DEBUG_MODE_ADVANCED is not + * enabled, error output will not go to the log, either. + * + * This provides an alternative to the @ error-suppression + * operator where errors will not be shown in the interface + * but will show up in the server log file (assuming the + * administrator has configured PHP logging). + * + * @since 1.4.12 and 1.5.2 + * + * @param string $function The function to be executed + * @param array $args The arguments to be passed to the function + * (OPTIONAL; default no arguments) + * NOTE: The caller must take extra action if + * the function being called is supposed + * to use any of the parameters by + * reference. In the following example, + * $x is passed by reference and $y is + * passed by value to the "my_func" + * function. + * sq_call_function_suppress_errors('my_func', array(&$x, $y)); + * + * @return mixed The return value, if any, of the function being + * executed will be returned. + * + */ +function sq_call_function_suppress_errors($function, $args=NULL) { + global $sm_debug_mode; + + $display_errors = ini_get('display_errors'); + ini_set('display_errors', '0'); + + // if advanced debug mode isn't enabled, don't log the error, either + // + if (!($sm_debug_mode & SM_DEBUG_MODE_ADVANCED)) + $error_reporting = error_reporting(0); + + $ret = call_user_func_array($function, $args); + + if (!($sm_debug_mode & SM_DEBUG_MODE_ADVANCED)) + error_reporting($error_reporting); + + ini_set('display_errors', $display_errors); + return $ret; +} + +/** + * Add a variable to the session. + * @param mixed $var the variable to register + * @param string $name the name to refer to this variable + * @return void + */ function sqsession_register ($var, $name) { - if ( (float)substr(PHP_VERSION,0,3) < 4.1 ) { - global $HTTP_SESSION_VARS; - $HTTP_SESSION_VARS["$name"] = $var; - } - else { - $_SESSION["$name"] = $var; - } + + sqsession_is_active(); + + $_SESSION[$name] = $var; } + +/** + * Delete a variable from the session. + * @param string $name the name of the var to delete + * @return void + */ function sqsession_unregister ($name) { - if ( (float)substr(PHP_VERSION,0,3) < 4.1 ) { - global $HTTP_SESSION_VARS; - unset($HTTP_SESSION_VARS["$name"]); - } - else { - unset($_SESSION["$name"]); - } + + sqsession_is_active(); + + unset($_SESSION[$name]); + + session_unregister("$name"); } + +/** + * Checks to see if a variable has already been registered + * in the session. + * @param string $name the name of the var to check + * @return bool whether the var has been registered + */ function sqsession_is_registered ($name) { $test_name = &$name; $result = false; - if ( (float)substr(PHP_VERSION,0,3) < 4.1 ) { - global $HTTP_SESSION_VARS; - if (isset($HTTP_SESSION_VARS[$test_name])) { - $result = true; + + if (isset($_SESSION[$test_name])) { + $result = true; + } + + return $result; +} + + +/** + * Retrieves a form variable, from a set of possible similarly named + * form variables, based on finding a different, single field. This + * is intended to allow more than one same-named inputs in a single + *