From: <ch...@us...> - 2011-02-11 21:44:24
|
Revision: 32598 http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=32598&view=rev Author: chealer Date: 2011-02-11 21:44:17 +0000 (Fri, 11 Feb 2011) Log Message: ----------- [FIX] Object permissions: pass all treetable array arguments as arrays instead of comma-separated strings, since there was no way to encode commas in values, and they are used as separators Modified Paths: -------------- trunk/tiki-objectpermissions.php Modified: trunk/tiki-objectpermissions.php =================================================================== --- trunk/tiki-objectpermissions.php 2011-02-11 21:40:45 UTC (rev 32597) +++ trunk/tiki-objectpermissions.php 2011-02-11 21:44:17 UTC (rev 32598) @@ -349,9 +349,9 @@ } -$smarty->assign('permGroups', implode(',', $permGroups)); +$smarty->assign('permGroups', $permGroups); $smarty->assign('permGroupCols', $groupIndices); -$smarty->assign('groupNames', implode(',', $groupNames)); +$smarty->assign('groupNames', $groupNames); //$smarty->assign('groupInheritance', $groupInheritance); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jon...@us...> - 2011-03-17 19:20:47
|
Revision: 33474 http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=33474&view=rev Author: jonnybradley Date: 2011-03-17 19:20:40 +0000 (Thu, 17 Mar 2011) Log Message: ----------- [FIX] cookietab: remove old code giving warnings Modified Paths: -------------- trunk/tiki-objectpermissions.php Modified: trunk/tiki-objectpermissions.php =================================================================== --- trunk/tiki-objectpermissions.php 2011-03-17 19:18:10 UTC (rev 33473) +++ trunk/tiki-objectpermissions.php 2011-03-17 19:20:40 UTC (rev 33474) @@ -490,8 +490,6 @@ $headerlib->add_jq_onready($js); ask_ticket('object-perms'); -setcookie('tab', $cookietab); -$smarty->assign('cookietab', $cookietab); // setup smarty remarks flags This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <lph...@us...> - 2011-04-18 16:56:47
|
Revision: 34019 http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=34019&view=rev Author: lphuberdeau Date: 2011-04-18 16:56:40 +0000 (Mon, 18 Apr 2011) Log Message: ----------- [MOD]?\194?\160Reload data after applying changes Modified Paths: -------------- trunk/tiki-objectpermissions.php Modified: trunk/tiki-objectpermissions.php =================================================================== --- trunk/tiki-objectpermissions.php 2011-04-18 16:06:06 UTC (rev 34018) +++ trunk/tiki-objectpermissions.php 2011-04-18 16:56:40 UTC (rev 34019) @@ -242,29 +242,7 @@ } - -// Prepare display -// Get the individual object permissions if any - -$displayedPermissions = get_displayed_permissions(); - -if (isset($_REQUEST['used_groups'])) { - $group_filter = array(); - foreach ( $displayedPermissions->getPermissionArray() as $group => $perms ) { - $group_filter[] = $group; - $group_filter = array_merge($group_filter, $userlib->get_including_groups($group, 'y')); - } - if (empty($group_filter)) { - $group_filter = array('Anonymous', 'Registered', 'Admins'); - } - foreach ( $group_filter as $i=>$group) { - $ginfo = $userlib->get_group_info($group); - $group_filter[$i] = $ginfo['id']; - } - $cookietab = 1; -} - -//Quickperms {{{ +//Quickperms apply {{{ //Test to map permissions of ile galleries into read write admin admin levels. if( $prefs['feature_quick_object_perms'] == 'y' ) { require_once 'lib/core/Perms/Reflection/Quick.php'; @@ -297,6 +275,31 @@ $permissionApplier->apply( $newPermissions ); } } +// }}} + +// Prepare display +// Get the individual object permissions if any + +$displayedPermissions = get_displayed_permissions(); + +if (isset($_REQUEST['used_groups'])) { + $group_filter = array(); + foreach ( $displayedPermissions->getPermissionArray() as $group => $perms ) { + $group_filter[] = $group; + $group_filter = array_merge($group_filter, $userlib->get_including_groups($group, 'y')); + } + if (empty($group_filter)) { + $group_filter = array('Anonymous', 'Registered', 'Admins'); + } + foreach ( $group_filter as $i=>$group) { + $ginfo = $userlib->get_group_info($group); + $group_filter[$i] = $ginfo['id']; + } + $cookietab = 1; +} + + +// Quick perms load {{{ //Quickperm groups stuff if( $prefs['feature_quick_object_perms'] == 'y' ) { $groupNames = array(); @@ -304,6 +307,15 @@ $groupNames[] = $group['groupName']; } + $qperms = quickperms_get_data(); + $smarty->assign('quickperms', $qperms); + $quickperms = new Perms_Reflection_Quick; + + foreach( $qperms as $type => $data ) { + $quickperms->configure( $type, $data['data'] ); + } + + $displayedPermissions = get_displayed_permissions(); $map = $quickperms->getAppliedPermissions( $displayedPermissions, $groupNames ); foreach($groups['data'] as $key=>$group) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jon...@us...> - 2011-09-03 19:28:24
|
Revision: 36875 http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=36875&view=rev Author: jonnybradley Date: 2011-09-03 19:28:18 +0000 (Sat, 03 Sep 2011) Log Message: ----------- [FIX] perms admin: Tree Table needs to be sorted by type Modified Paths: -------------- trunk/tiki-objectpermissions.php Modified: trunk/tiki-objectpermissions.php =================================================================== --- trunk/tiki-objectpermissions.php 2011-09-03 19:25:18 UTC (rev 36874) +++ trunk/tiki-objectpermissions.php 2011-09-03 19:28:18 UTC (rev 36875) @@ -425,6 +425,12 @@ } $features = $features_filtered; } +function compare_perms($ar1, $ar2) { + return strcasecmp($ar1['type'], $ar2['type']) === 0 ? + strcasecmp($ar1['permName'], $ar2['permName']) : + strcasecmp($ar1['type'], $ar2['type']); +} +usort($masterPerms, 'compare_perms');; $smarty->assign_by_ref('perms', $masterPerms); $smarty->assign_by_ref('features', $features); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <xe...@us...> - 2012-01-22 05:00:59
|
Revision: 39620 http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=39620&view=rev Author: xen216 Date: 2012-01-22 05:00:53 +0000 (Sun, 22 Jan 2012) Log Message: ----------- [merge/r39619] [FIX] disabled checkboxes weren't un-disabling properly by javascript when parent group was unchecked because attr('checked') returned 'checked' which evaluates to true. replaced with is(':checked') Revision Links: -------------- http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=39619&view=rev Modified Paths: -------------- trunk/tiki-objectpermissions.php Modified: trunk/tiki-objectpermissions.php =================================================================== --- trunk/tiki-objectpermissions.php 2012-01-22 04:58:42 UTC (rev 39619) +++ trunk/tiki-objectpermissions.php 2012-01-22 05:00:53 UTC (rev 39620) @@ -460,16 +460,16 @@ loop: function() { // each one of this group - if (\$(this).attr('checked')) { + if (\$(this).is(':checked')) { \$('input[value="'+\$(this).val()+'"]'). // other checkboxes of same value (perm) filter('$beneficiaries'). // which inherit from this - attr('checked',\$(this).attr('checked')). // check and disable - attr('disabled',\$(this).attr('checked')); + attr('checked',\$(this).is(':checked')). // check and disable + attr('disabled',\$(this).is(':checked')); } \$(this).change( function() { // bind click event - if (\$(this).attr('checked')) { + if (\$(this).is(':checked')) { \$('input[value="'+\$(this).val()+'"]'). // same... filter('$beneficiaries'). attr('checked',true). // check? This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sy...@us...> - 2012-03-16 21:24:03
|
Revision: 40223 http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=40223&view=rev Author: sylvieg Date: 2012-03-16 21:23:56 +0000 (Fri, 16 Mar 2012) Log Message: ----------- [merge/r40222][FIX]perm: objectype=wiki+page was not goind through Revision Links: -------------- http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=40222&view=rev Modified Paths: -------------- trunk/tiki-objectpermissions.php Modified: trunk/tiki-objectpermissions.php =================================================================== --- trunk/tiki-objectpermissions.php 2012-03-16 21:20:11 UTC (rev 40222) +++ trunk/tiki-objectpermissions.php 2012-03-16 21:23:56 UTC (rev 40223) @@ -32,7 +32,7 @@ //'show_disabled_features', // this seems to cause issues - the $_GET version overrides the $_POST one... ); -$perm = 'tiki_p_assign_perm_' . str_replace(' ', '_', $_REQUEST['objectType']); +$perm = 'tiki_p_assign_perm_' . preg_replace('/[ +]/', '_', $_REQUEST['objectType']); if ($_REQUEST['objectType'] == 'wiki page') { if ($tiki_p_admin_wiki == 'y') { $special_perm = 'y'; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sy...@us...> - 2012-03-18 11:35:06
|
Revision: 40237 http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=40237&view=rev Author: sylvieg Date: 2012-03-18 11:35:00 +0000 (Sun, 18 Mar 2012) Log Message: ----------- [merge/r40236][FIX]category: can affect perm for another group to this object if the user has perm on this object not global perm Revision Links: -------------- http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=40236&view=rev Modified Paths: -------------- trunk/tiki-objectpermissions.php Modified: trunk/tiki-objectpermissions.php =================================================================== --- trunk/tiki-objectpermissions.php 2012-03-18 11:33:23 UTC (rev 40236) +++ trunk/tiki-objectpermissions.php 2012-03-18 11:35:00 UTC (rev 40237) @@ -190,7 +190,7 @@ if (isset($_REQUEST['perm']) && !empty($_REQUEST['perm'])) { foreach ($_REQUEST['perm'] as $group => $gperms) { foreach ($gperms as $perm) { - if ($tiki_p_admin_objects != 'y' && !$userlib->user_has_permission($user, $perm)) { + if ($tiki_p_admin_objects != 'y' && !$userlib->user_has_perm_on_object($user, $_REQUEST['objectId'], $_REQUEST['objectType'], $perm)) { $smarty->assign('errortype', 401); $smarty->assign('msg', tra('Permission denied')); $smarty->display('error.tpl'); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jon...@us...> - 2017-10-03 06:32:16
|
Revision: 64098 http://sourceforge.net/p/tikiwiki/code/64098 Author: jonnybradley Date: 2017-10-03 06:32:13 +0000 (Tue, 03 Oct 2017) Log Message: ----------- [FIX] perms: Keep info about object being edited when setting quick permissions Modified Paths: -------------- trunk/tiki-objectpermissions.php Modified: trunk/tiki-objectpermissions.php =================================================================== --- trunk/tiki-objectpermissions.php 2017-10-03 05:09:38 UTC (rev 64097) +++ trunk/tiki-objectpermissions.php 2017-10-03 06:32:13 UTC (rev 64098) @@ -342,7 +342,12 @@ $newPermissions->add('Admins', 'tiki_p_admin'); } $permissionApplier->apply($newPermissions); - $access->redirect($_SERVER['REQUEST_URI']); + $url = $_SERVER['REQUEST_URI']; + $query = array_filter(array_intersect_key($_REQUEST, array_flip(['objectType', 'objectId', 'permType', 'objectName']))); + if ($query) { + $url .= '?' . http_build_query($query, null, '&'); + } + $access->redirect($url); } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jy...@us...> - 2019-09-24 18:12:40
|
Revision: 71054 http://sourceforge.net/p/tikiwiki/code/71054 Author: jyhem Date: 2019-09-24 18:12:39 +0000 (Tue, 24 Sep 2019) Log Message: ----------- [FIX] Don't let group names with quotes break the display Modified Paths: -------------- trunk/tiki-objectpermissions.php Modified: trunk/tiki-objectpermissions.php =================================================================== --- trunk/tiki-objectpermissions.php 2019-09-24 17:47:26 UTC (rev 71053) +++ trunk/tiki-objectpermissions.php 2019-09-24 18:12:39 UTC (rev 71054) @@ -888,7 +888,7 @@ for (var group in permsAdded) { if (permsAdded.hasOwnProperty(group)) { for (var i = 0; i < permsAdded[group].length; i++) { - $("input[name=\'perm[" + group + "][]\'][value=\'tiki_p_" + permsAdded[group][i] + "\']").parent().addClass("added"); + $("input[name=\'perm[" + `group` + "][]\'][value=\'tiki_p_" + permsAdded[group][i] + "\']").parent().addClass("added"); } } } @@ -895,7 +895,7 @@ for (var group in permsRemoved) { if (permsRemoved.hasOwnProperty(group)) { for (var i = 0; i < permsRemoved[group].length; i++) { - $("input[name=\'perm[" + group + "][]\'][value=\'tiki_p_" + permsRemoved[group][i] + "\']").parent().addClass("removed"); + $("input[name=\'perm[" + `group` + "][]\'][value=\'tiki_p_" + permsRemoved[group][i] + "\']").parent().addClass("removed"); } } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |