holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed not working seek in stream-wrapper, caused by sw interface uses true/false while fseek uses 0/-1

Browse Source
This commit is contained in:
Ralf Becker 2015-01-10 13:04:51 +00:00
parent 7346a37998
commit 50d87c2963
4 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
phpgwapi/inc/class.egw_framework.inc.php
View File

@ -207,7 +207,7 @@ abstract class egw_framework
// - "connect-src 'self'" allows ajax requests only to self // - "connect-src 'self'" allows ajax requests only to self
// - "style-src 'self' 'unsave-inline'" allows only self and inline style, which we need // - "style-src 'self' 'unsave-inline'" allows only self and inline style, which we need
// - "frame-src 'self' manual.egroupware.org" allows frame and iframe content only for self or manual.egroupware.org // - "frame-src 'self' manual.egroupware.org" allows frame and iframe content only for self or manual.egroupware.org
$frame_src = array("'self'", 'manual.egroupware.org'); $frame_src = array("'self'", 'manual.egroupware.org', 'www.egroupware.org');
if (($additional = $this->_get_csp_frame_src())) $frame_src = array_unique(array_merge($frame_src, $additional)); if (($additional = $this->_get_csp_frame_src())) $frame_src = array_unique(array_merge($frame_src, $additional));
$csp = "script-src 'self' ".self::csp_script_src_attrs(). $csp = "script-src 'self' ".self::csp_script_src_attrs().

8
phpgwapi/inc/class.filesystem_stream_wrapper.inc.php
View File

@ -250,14 +250,14 @@ class filesystem_stream_wrapper implements iface_stream_wrapper
* See fseek() for more information about these parameters. * See fseek() for more information about these parameters.
* *
* @param integer $offset * @param integer $offset
* @param integer $whence SEEK_SET - Set position equal to offset bytes * @param integer $whence SEEK_SET - 0 - Set position equal to offset bytes
* SEEK_CUR - Set position to current location plus offset. * SEEK_CUR - 1 - Set position to current location plus offset.
* SEEK_END - Set position to end-of-file plus offset. (To move to a position before the end-of-file, you need to pass a negative value in offset.) * SEEK_END - 2 - Set position to end-of-file plus offset. (To move to a position before the end-of-file, you need to pass a negative value in offset.)
* @return boolean TRUE if the position was updated, FALSE otherwise. * @return boolean TRUE if the position was updated, FALSE otherwise.
*/ */
function stream_seek ( $offset, $whence ) function stream_seek ( $offset, $whence )
{ {
return fseek($this->opened_stream,$offset,$whence); return !fseek($this->opened_stream,$offset,$whence); // fseek returns 0 on success and -1 on failure
} }
/** /**

8
phpgwapi/inc/class.sqlfs_stream_wrapper.inc.php
View File

@ -478,9 +478,9 @@ class sqlfs_stream_wrapper implements iface_stream_wrapper
* See fseek() for more information about these parameters. * See fseek() for more information about these parameters.
* *
* @param integer $offset * @param integer $offset
* @param integer $whence SEEK_SET - Set position equal to offset bytes * @param integer $whence SEEK_SET - 0 - Set position equal to offset bytes
* SEEK_CUR - Set position to current location plus offset. * SEEK_CUR - 1 - Set position to current location plus offset.
* SEEK_END - Set position to end-of-file plus offset. (To move to a position before the end-of-file, you need to pass a negative value in offset.) * SEEK_END - 2 - Set position to end-of-file plus offset. (To move to a position before the end-of-file, you need to pass a negative value in offset.)
* @return boolean TRUE if the position was updated, FALSE otherwise. * @return boolean TRUE if the position was updated, FALSE otherwise.
*/ */
function stream_seek ( $offset, $whence ) function stream_seek ( $offset, $whence )
@ -489,7 +489,7 @@ class sqlfs_stream_wrapper implements iface_stream_wrapper
if (is_resource($this->opened_stream)) if (is_resource($this->opened_stream))
{ {
return fseek($this->opened_stream,$offset,$whence); return !fseek($this->opened_stream,$offset,$whence); // fseek returns 0 on success and -1 on failure
} }
return false; return false;
} }

8
phpgwapi/inc/class.vfs_stream_wrapper.inc.php
View File

@ -411,14 +411,14 @@ class vfs_stream_wrapper implements iface_stream_wrapper
* See fseek() for more information about these parameters. * See fseek() for more information about these parameters.
* *
* @param integer $offset * @param integer $offset
* @param integer $whence SEEK_SET - Set position equal to offset bytes * @param integer $whence SEEK_SET - 0 - Set position equal to offset bytes
* SEEK_CUR - Set position to current location plus offset. * SEEK_CUR - 1 - Set position to current location plus offset.
* SEEK_END - Set position to end-of-file plus offset. (To move to a position before the end-of-file, you need to pass a negative value in offset.) * SEEK_END - 2 - Set position to end-of-file plus offset. (To move to a position before the end-of-file, you need to pass a negative value in offset.)
* @return boolean TRUE if the position was updated, FALSE otherwise. * @return boolean TRUE if the position was updated, FALSE otherwise.
*/ */
function stream_seek ( $offset, $whence ) function stream_seek ( $offset, $whence )
{ {
return fseek($this->opened_stream,$offset,$whence); return !fseek($this->opened_stream,$offset,$whence); // fseek returns 0 on success and -1 on failure
} }
/** /**