}
}
+/**
+ * Squelch error output to screen (only) for the given function.
+ *
+ * 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) {
+ $display_errors = ini_get('display_errors');
+ ini_set('display_errors', '0');
+ $ret = call_user_func_array($function, $args);
+ ini_set('display_errors', $display_errors);
+ return $ret;
+}
+
/**
* Add a variable to the session.
* @param mixed $var the variable to register
* merging of sessions.
*/
- global $base_uri;
+ global $base_uri, $_COOKIE, $_SESSION;
if (isset($_COOKIE[session_name()]) && session_name()) sqsetcookie(session_name(), '', 0, $base_uri);
if (isset($_COOKIE['username']) && $_COOKIE['username']) sqsetcookie('username','',0,$base_uri);
* start a session up. php.net doesn't tell you that $_SESSION
* (even though autoglobal), is not created unless a session is
* started, unlike $_POST, $_GET and such
+ * Update: (see #1685031) the session ID is left over after the
+ * session is closed in some PHP setups; this function just becomes
+ * a passthru to sqsession_start(), but leaving old code in for
+ * edification.
*/
function sqsession_is_active() {
- $sessid = session_id();
- if ( empty( $sessid ) ) {
+ //$sessid = session_id();
+ //if ( empty( $sessid ) ) {
sqsession_start();
- }
+ //}
}
/**
* Function to start the session and store the cookie with the session_id as
* HttpOnly cookie which means that the cookie isn't accessible by javascript
* (IE6 only)
+ * Note that as sqsession_is_active() no longer discriminates as to when
+ * it calls this function, session_start() has to have E_NOTICE suppression
+ * (thus the @ sign).
*/
function sqsession_start() {
global $base_uri;
- session_start();
+ sq_call_function_suppress_errors('session_start');
+ // was: @session_start();
$session_id = session_id();
// session_starts sets the sessionid cookie buth without the httponly var
* @param boolean $bHttpOnly Disallow JS to access the cookie (IE6 only)
* @return void
*/
-function sqsetcookie($sName,$sValue='',$iExpire=0,$sPath="",$sDomain="",$bSecure=false,$bHttpOnly=true) {
+function sqsetcookie($sName,$sValue='deleted',$iExpire=0,$sPath="",$sDomain="",$bSecure=false,$bHttpOnly=true) {
// if we have a secure connection then limit the cookies to https only.
if ($sName && isset($_SERVER['HTTPS']) && $_SERVER['HTTPS']) {
$bSecure = true;
// broken we use the header function for php 5.2 as well. We might change that later.
//setcookie($sName,$sValue,(int) $iExpire,$sPath,$sDomain,$bSecure,$bHttpOnly);
} else {
- if (!empty($Domain)) {
+ if (!empty($sDomain)) {
// Fix the domain to accept domains with and without 'www.'.
- if (strtolower(substr($Domain, 0, 4)) == 'www.') $Domain = substr($Domain, 4);
- $Domain = '.' . $Domain;
+ if (strtolower(substr($sDomain, 0, 4)) == 'www.') $sDomain = substr($sDomain, 4);
+ $sDomain = '.' . $sDomain;
// Remove port information.
- $Port = strpos($Domain, ':');
- if ($Port !== false) $Domain = substr($Domain, 0, $Port);
+ $Port = strpos($sDomain, ':');
+ if ($Port !== false) $sDomain = substr($sDomain, 0, $Port);
}
- if (!$sValue) $sValue = '';
+ if (!$sValue) $sValue = 'deleted';
header('Set-Cookie: ' . rawurlencode($sName) . '=' . rawurlencode($sValue)
- . (empty($iExpires) ? '' : '; expires=' . gmdate('D, d-M-Y H:i:s', $iExpires) . ' GMT')
+ . (empty($iExpire) ? '' : '; expires=' . gmdate('D, d-M-Y H:i:s', $iExpire) . ' GMT')
. (empty($sPath) ? '' : '; path=' . $sPath)
. (empty($sDomain) ? '' : '; domain=' . $sDomain)
. (!$bSecure ? '' : '; secure')
*
* @param string $directory_path The path (relative or absolute)
* to the desired directory.
- * @param string $extension The file extension filter (optional;
- * default is to return all files (dirs).
+ * @param mixed $extension The file extension filter - either
+ * an array of desired extension(s),
+ * or a comma-separated list of same
+ * (optional; default is to return
+ * all files (dirs).
* @param boolean $return_filenames_only When TRUE, only file/dir names
* are returned, otherwise the
* $directory_path string is
* files or all directories
* (optional; default do not
* split up return array).
- *
+ * @param boolean $only_sm When TRUE, a security check will
+ * limit directory access to only
+ * paths within the SquirrelMail
+ * installation currently being used
+ * (optional; default TRUE)
*
* @return array The requested file/directory list(s).
*
* @since 1.5.2
*
*/
-function list_files($directory_path, $extension='', $return_filenames_only=TRUE,
+function list_files($directory_path, $extensions='', $return_filenames_only=TRUE,
$include_directories=TRUE, $directories_only=FALSE,
- $separate_files_and_directories=FALSE) {
+ $separate_files_and_directories=FALSE, $only_sm=TRUE) {
$files = array();
$directories = array();
-//FIXME: do we want to place security restrictions here like only allowing
-// directories under SM_PATH?
+
+ // make sure requested path is under SM_PATH if needed
+ //
+ if ($only_sm) {
+ if (strpos(realpath($directory_path), realpath(SM_PATH)) !== 0) {
+ //plain_error_message(_("Illegal filesystem access was requested"));
+ echo _("Illegal filesystem access was requested");
+ exit;
+ }
+ }
+
+
// validate given directory
//
if (empty($directory_path)
}
- if (!empty($extension)) $extension = '.' . trim($extension, '.');
+ // ensure extensions is an array and is properly formatted
+ //
+ if (!empty($extensions)) {
+ if (!is_array($extensions))
+ $extensions = explode(',', $extensions);
+ $temp_extensions = array();
+ foreach ($extensions as $ext)
+ $temp_extensions[] = '.' . trim(trim($ext), '.');
+ $extensions = $temp_extensions;
+ } else $extensions = array();
+
+
$directory_path = rtrim($directory_path, '/');
if ($file == '.' || $file == '..') continue;
- if (!empty($extension)
- && strrpos($file, $extension) !== (strlen($file) - strlen($extension)))
- continue;
+ if (!empty($extensions))
+ foreach ($extensions as $ext)
+ if (strrpos($file, $ext) !== (strlen($file) - strlen($ext)))
+ continue 2;
// only use is_dir() if we really need to (be as efficient as possible)
//
print htmlentities($buffer);
print '</pre></div>';
}
+
+
+/**
+ * Sanitize a value using htmlspecialchars() or similar, but also
+ * recursively run htmlspecialchars() (or similar) on array keys
+ * and values.
+ *
+ * If $value is not a string or an array with strings in it,
+ * the value is returned as is.
+ *
+ * @param mixed $value The value to be sanitized.
+ * @param mixed $quote_style Either boolean or an integer. If it
+ * is an integer, it must be the PHP
+ * constant indicating if/how to escape
+ * quotes: ENT_QUOTES, ENT_COMPAT, or
+ * ENT_NOQUOTES. If it is a boolean value,
+ * it must be TRUE and thus indicates
+ * that the only sanitizing to be done
+ * herein is to replace single and double
+ * quotes with ' and ", no other
+ * changes are made to $value. If it is
+ * boolean and FALSE, behavior reverts
+ * to same as if the value was ENT_QUOTES
+ * (OPTIONAL; default is ENT_QUOTES).
+ *
+ * @return mixed The sanitized value.
+ *
+ * @since 1.5.2
+ *
+ **/
+function sq_htmlspecialchars($value, $quote_style=ENT_QUOTES) {
+
+ if ($quote_style === FALSE) $quote_style = ENT_QUOTES;
+
+ // array? go recursive...
+ //
+ if (is_array($value)) {
+ $return_array = array();
+ foreach ($value as $key => $val) {
+ $return_array[sq_htmlspecialchars($key, $quote_style)]
+ = sq_htmlspecialchars($val, $quote_style);
+ }
+ return $return_array;
+
+ // sanitize strings only
+ //
+ } else if (is_string($value)) {
+ if ($quote_style === TRUE)
+ return str_replace(array('\'', '"'), array(''', '"'), $value);
+ else
+ return htmlspecialchars($value, $quote_style);
+ }
+
+ // anything else gets returned with no changes
+ //
+ return $value;
+
+}
projects / squirrelmail.git / blobdiff