packages: dokuwiki-tpl-sidebar/dokuwiki-tpl-sidebar.spec, dokuwiki-tpl-side...

[glen]

Author: glen                         Date: Mon Mar 22 17:57:09 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- do not show sidebar if sidebar file is not accessible

---- Files affected:
packages/dokuwiki-tpl-sidebar:
   dokuwiki-tpl-sidebar.spec (1.12 -> 1.13) , acl-check.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/dokuwiki-tpl-sidebar/dokuwiki-tpl-sidebar.spec
diff -u packages/dokuwiki-tpl-sidebar/dokuwiki-tpl-sidebar.spec:1.12 packages/dokuwiki-tpl-sidebar/dokuwiki-tpl-sidebar.spec:1.13
--- packages/dokuwiki-tpl-sidebar/dokuwiki-tpl-sidebar.spec:1.12	Sat Aug 29 23:25:51 2009
+++ packages/dokuwiki-tpl-sidebar/dokuwiki-tpl-sidebar.spec	Mon Mar 22 18:57:04 2010
@@ -6,13 +6,14 @@
 Summary(pl.UTF-8):	Nawigacja po sidebarze przy użyciu DokuWiki
 Name:		dokuwiki-tpl-sidebar
 Version:	%{ver}
-Release:	3
+Release:	4
 License:	GPL
 Group:		Applications/WWW
 Source0:	http://dokuwiki.jalakai.co.uk/template-sidebar-rc%{snap}.zip
 # Source0-md5:	7a36b63e86d00f72eecae2ba80334fdd
 Patch0:		backlink-rightside.patch
 Patch1:		more-buttons.patch
+Patch2:		acl-check.patch
 URL:		http://www.dokuwiki.org/template:sidebar
 BuildRequires:	rpmbuild(macros) >= 1.268
 Requires:	dokuwiki >= 20090126
@@ -40,9 +41,11 @@
 %setup -q -n %{tpl}
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 cat > INSTALL <<'EOF'
 To activate this template add the following to your conf/local.php file:
+
 $conf['template']    = '%{tpl}';
 
 If you want a tagline, you can define it as follows:
@@ -75,6 +78,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.13  2010/03/22 17:57:04  glen
+- do not show sidebar if sidebar file is not accessible
+
 Revision 1.12  2009/08/29 21:25:51  glen
 - pass revno in export
 

================================================================
Index: packages/dokuwiki-tpl-sidebar/acl-check.patch
diff -u /dev/null packages/dokuwiki-tpl-sidebar/acl-check.patch:1.1
--- /dev/null	Mon Mar 22 18:57:09 2010
+++ packages/dokuwiki-tpl-sidebar/acl-check.patch	Mon Mar 22 18:57:03 2010
@@ -0,0 +1,12 @@
+--- sidebar/tplfn_sidebar.php~	2010-03-22 19:53:07.000000000 +0200
++++ sidebar/tplfn_sidebar.php	2010-03-22 19:54:26.889836553 +0200
+@@ -73,6 +73,9 @@
+     $fileSidebar = getSidebarFN(getNS($ID), tpl_getConf('page'));
+   }
+ 
++  // check user has read permission for the sidebar page
++  if (auth_quickaclcheck($fileSidebar) < AUTH_READ) return;
++
+   // determine what to display
+   if ($fileSidebar) {
+     $ID = $fileSidebar;
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/dokuwiki-tpl-sidebar/dokuwiki-tpl-sidebar.spec?r1=1.12&r2=1.13&f=u