Streams/streams
Streams/streams
1
0
Fork 0
mirror of https://codeberg.org/streams/streams.git synced 2024-09-21 14:35:18 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'upstream/master'

Browse source
This commit is contained in:
zottel 2015-09-07 13:18:55 +02:00
commit c5981cbc9a
3 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
include/security.php
View file

@ -256,7 +256,7 @@ function item_permissions_sql($owner_id, $remote_observer = null) {
$regexop = db_getfunc('REGEXP'); $regexop = db_getfunc('REGEXP');
$sql = sprintf( $sql = sprintf(
" AND ( NOT (deny_cid like '%s' OR deny_gid $regexop '%s') " AND ( NOT (deny_cid like '%s' OR deny_gid $regexop '%s')
AND ( allow_cid like '%s' OR allow_gid $regexop '%s' OR ( allow_cid = '' AND allow_gid = '') ) AND ( allow_cid like '%s' OR allow_gid $regexop '%s' OR ( allow_cid = '' AND allow_gid = '' AND item_private = 0 ) )
) )
", ",
dbesc(protect_sprintf( '%<' . $observer . '>%')), dbesc(protect_sprintf( '%<' . $observer . '>%')),
@ -291,7 +291,7 @@ function public_permissions_sql($observer_hash) {
$regexop = db_getfunc('REGEXP'); $regexop = db_getfunc('REGEXP');
$sql = sprintf( $sql = sprintf(
" OR (( NOT (deny_cid like '%s' OR deny_gid $regexop '%s') " OR (( NOT (deny_cid like '%s' OR deny_gid $regexop '%s')
AND ( allow_cid like '%s' OR allow_gid $regexop '%s' OR ( allow_cid = '' AND allow_gid = '') ) AND ( allow_cid like '%s' OR allow_gid $regexop '%s' OR ( allow_cid = '' AND allow_gid = '' AND item_private = 0 ) )
)) ))
", ",
dbesc(protect_sprintf( '%<' . $observer_hash . '>%')), dbesc(protect_sprintf( '%<' . $observer_hash . '>%')),

2
version.inc
View file

@ -1 +1 @@
2015-09-03.1144 2015-09-07.1148

7
view/tpl/uexport.tpl
View file

@ -1,9 +1,12 @@
<div class="generic-content-wrapper"> <div class="generic-content-wrapper">
<h1>{{$title}}</h1> <div class="section-title-wrapper">
<h2>{{$title}}</h2>
</div>
<div class="section-content-wrapper">
<b><a href="uexport/basic">{{$basictitle}}</a></b></p> <b><a href="uexport/basic">{{$basictitle}}</a></b></p>
<p>{{$basic}}</p> <p>{{$basic}}</p>
<p><b><a href="uexport/complete">{{$fulltitle}}</a></b></p> <p><b><a href="uexport/complete">{{$fulltitle}}</a></b></p>
<p>{{$full}}</p> <p>{{$full}}</p>
</div>
</div> </div>