From: <sy...@us...> - 2009-01-30 18:43:03
|
Revision: 16478 http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=16478&view=rev Author: sylvieg Date: 2009-01-30 18:42:58 +0000 (Fri, 30 Jan 2009) Log Message: ----------- typo Modified Paths: -------------- trunk/lib/wiki-plugins/wikiplugin_subscribegroups.php Modified: trunk/lib/wiki-plugins/wikiplugin_subscribegroups.php =================================================================== --- trunk/lib/wiki-plugins/wikiplugin_subscribegroups.php 2009-01-30 17:01:51 UTC (rev 16477) +++ trunk/lib/wiki-plugins/wikiplugin_subscribegroups.php 2009-01-30 18:42:58 UTC (rev 16478) @@ -1,12 +1,9 @@ <?php // $Id: /cvsroot/tikiwiki/tiki/lib/wiki-plugins/wikiplugin_subscribegroups.php,v 1.1.2.1 2007-12-04 20:33:16 sylvieg Exp $ -// Display wiki text if user is in one of listed groups -// Usage: -// {GROUP(groups=>Admins|Developers)}wiki text{GROUP} function wikiplugin_subscribegroups_help() { $help = tra('Subscribe or unsubscribe to a group').":\n"; - $help.= "~np~<br />{SUBSCRIBEGROUPS(subscribe=text,groups=g1,g2) /}<br />~/np~"; + $help.= "~np~<br />{SUBSCRIBEGROUPS(subscribe=text,groups=g1:g2) /}<br />~/np~"; return $help; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sy...@us...> - 2009-05-19 23:12:06
|
Revision: 18927 http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=18927&view=rev Author: sylvieg Date: 2009-05-19 23:11:50 +0000 (Tue, 19 May 2009) Log Message: ----------- oops Modified Paths: -------------- trunk/lib/wiki-plugins/wikiplugin_subscribegroups.php Modified: trunk/lib/wiki-plugins/wikiplugin_subscribegroups.php =================================================================== --- trunk/lib/wiki-plugins/wikiplugin_subscribegroups.php 2009-05-19 21:23:32 UTC (rev 18926) +++ trunk/lib/wiki-plugins/wikiplugin_subscribegroups.php 2009-05-19 23:11:50 UTC (rev 18927) @@ -62,7 +62,7 @@ $groups = explode(':',$groups); } if (!empty($including)) { - $groups = get_including_groups($including); + $groups = $userlib->get_including_groups($including); } if ($group) { if ($group == 'Anonymous' || $group == 'Registered') { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sy...@us...> - 2009-05-26 12:04:34
|
Revision: 19091 http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=19091&view=rev Author: sylvieg Date: 2009-05-26 12:04:15 +0000 (Tue, 26 May 2009) Log Message: ----------- [FIX] wrong parameter name Modified Paths: -------------- trunk/lib/wiki-plugins/wikiplugin_subscribegroups.php Modified: trunk/lib/wiki-plugins/wikiplugin_subscribegroups.php =================================================================== --- trunk/lib/wiki-plugins/wikiplugin_subscribegroups.php 2009-05-26 09:56:23 UTC (rev 19090) +++ trunk/lib/wiki-plugins/wikiplugin_subscribegroups.php 2009-05-26 12:04:15 UTC (rev 19091) @@ -95,16 +95,16 @@ if (!empty($_REQUEST['unassign']) && isset($userGroups[$group])) { $userlib->remove_user_from_group($user, $group); } + $userGroups = $userlib->get_user_groups_inclusion($user); if (!empty($_REQUEST['default']) && isset($userGroups[$_REQUEST['default']])) { $userlib->set_default_group($user, $_REQUEST['default']); global $group; $group = $_REQUEST['default']; - if (isset($urldefault)) { - header("Location: $urldefault"); + if (isset($defaulturl)) { + header("Location: $defaulturl"); die; } } - $userGroups = $userlib->get_user_groups_inclusion($user); if (isset($userGroups['Anonymous'])) { unset($userGroups['Anonymous']); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <nk...@us...> - 2011-09-02 00:24:26
|
Revision: 36794 http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=36794&view=rev Author: nkoth Date: 2011-09-02 00:24:19 +0000 (Fri, 02 Sep 2011) Log Message: ----------- [FIX] Descriptions not showing for groups that user is in but not userChoice. No harm having allGroups being really all groups since list to add from is controlled by userChoice and so no extra groups will be shown anyway Modified Paths: -------------- trunk/lib/wiki-plugins/wikiplugin_subscribegroups.php Modified: trunk/lib/wiki-plugins/wikiplugin_subscribegroups.php =================================================================== --- trunk/lib/wiki-plugins/wikiplugin_subscribegroups.php 2011-09-01 23:40:40 UTC (rev 36793) +++ trunk/lib/wiki-plugins/wikiplugin_subscribegroups.php 2011-09-02 00:24:19 UTC (rev 36794) @@ -144,7 +144,8 @@ } } - $allGroups = $userlib->get_groups(0, -1, 'groupName_asc', '', '', 'n', '', 'y'); + $allGroups = $userlib->get_groups(0, -1, 'groupName_asc', '', '', 'n'); + $possibleGroups = array(); foreach ($allGroups['data'] as $gr) { if ($gr['userChoice'] == 'y' && (empty($groups) || in_array($gr['groupName'], $groups)) && !isset($userGroups[$gr['groupName']]) && $gr['groupName'] != 'Registered' && $gr['groupName'] != 'Anonymous') { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <nk...@us...> - 2011-09-02 03:47:58
|
Revision: 36797 http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=36797&view=rev Author: nkoth Date: 2011-09-02 03:47:52 +0000 (Fri, 02 Sep 2011) Log Message: ----------- [FIX] Refine last commit, some missing non-critical checks and repeated line Modified Paths: -------------- trunk/lib/wiki-plugins/wikiplugin_subscribegroups.php Modified: trunk/lib/wiki-plugins/wikiplugin_subscribegroups.php =================================================================== --- trunk/lib/wiki-plugins/wikiplugin_subscribegroups.php 2011-09-02 02:56:15 UTC (rev 36796) +++ trunk/lib/wiki-plugins/wikiplugin_subscribegroups.php 2011-09-02 03:47:52 UTC (rev 36797) @@ -131,15 +131,14 @@ $userGroups = $userlib->get_user_groups_inclusion($user); if (isset($garray)) { foreach ($garray as $g) { - if (!empty($_REQUEST['assign']) && !isset($userGroups[$group])) { + if (!empty($_REQUEST['assign']) && !isset($userGroups[$g])) { $userlib->assign_user_to_group($user, $g); } - if (!empty($_REQUEST['unassign']) && isset($userGroups[$group])) { + if (!empty($_REQUEST['unassign']) && isset($userGroups[$g])) { $userlib->remove_user_from_group($user, $group); } } } - $userGroups = $userlib->get_user_groups_inclusion($user); if (!empty($_REQUEST['default']) && isset($userGroups[$_REQUEST['default']])) { $userlib->set_default_group($user, $_REQUEST['default']); if (isset($defaulturl)) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <nk...@us...> - 2011-09-02 04:03:12
|
Revision: 36798 http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=36798&view=rev Author: nkoth Date: 2011-09-02 04:03:06 +0000 (Fri, 02 Sep 2011) Log Message: ----------- [FIX] Correct last commit, need refresh after update Modified Paths: -------------- trunk/lib/wiki-plugins/wikiplugin_subscribegroups.php Modified: trunk/lib/wiki-plugins/wikiplugin_subscribegroups.php =================================================================== --- trunk/lib/wiki-plugins/wikiplugin_subscribegroups.php 2011-09-02 03:47:52 UTC (rev 36797) +++ trunk/lib/wiki-plugins/wikiplugin_subscribegroups.php 2011-09-02 04:03:06 UTC (rev 36798) @@ -138,6 +138,7 @@ $userlib->remove_user_from_group($user, $group); } } + $userGroups = $userlib->get_user_groups_inclusion($user); // refresh after update } if (!empty($_REQUEST['default']) && isset($userGroups[$_REQUEST['default']])) { $userlib->set_default_group($user, $_REQUEST['default']); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <nk...@us...> - 2012-03-27 17:08:41
|
Revision: 40431 http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=40431&view=rev Author: nkoth Date: 2012-03-27 17:08:34 +0000 (Tue, 27 Mar 2012) Log Message: ----------- [FIX] Groups not appearing when entered with trailing or leading spaces Modified Paths: -------------- trunk/lib/wiki-plugins/wikiplugin_subscribegroups.php Modified: trunk/lib/wiki-plugins/wikiplugin_subscribegroups.php =================================================================== --- trunk/lib/wiki-plugins/wikiplugin_subscribegroups.php 2012-03-27 16:14:15 UTC (rev 40430) +++ trunk/lib/wiki-plugins/wikiplugin_subscribegroups.php 2012-03-27 17:08:34 UTC (rev 40431) @@ -125,6 +125,11 @@ ); } +function trim_value(&$value) +{ + $value = trim($value); +} + function wikiplugin_subscribegroups($data, $params) { global $tiki_p_subscribe_groups, $userlib, $user, $smarty; @@ -147,6 +152,7 @@ if (!empty($including)) { $groups = $userlib->get_including_groups($including); } + array_walk($groups, 'trim_value'); if (!empty($hidelink_including)) { $privategroups = $userlib->get_including_groups($hidelink_including); $smarty->assign('privategroups', $privategroups); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <nk...@us...> - 2012-03-27 20:09:45
|
Revision: 40435 http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=40435&view=rev Author: nkoth Date: 2012-03-27 20:09:39 +0000 (Tue, 27 Mar 2012) Log Message: ----------- [ROLLBACK]r40431: this is not a good fix -problem needs to be solved at the root, group names should not have leading or training spaces to begin with on creation Revision Links: -------------- http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=40431&view=rev Modified Paths: -------------- trunk/lib/wiki-plugins/wikiplugin_subscribegroups.php Modified: trunk/lib/wiki-plugins/wikiplugin_subscribegroups.php =================================================================== --- trunk/lib/wiki-plugins/wikiplugin_subscribegroups.php 2012-03-27 20:08:49 UTC (rev 40434) +++ trunk/lib/wiki-plugins/wikiplugin_subscribegroups.php 2012-03-27 20:09:39 UTC (rev 40435) @@ -125,11 +125,6 @@ ); } -function trim_value(&$value) -{ - $value = trim($value); -} - function wikiplugin_subscribegroups($data, $params) { global $tiki_p_subscribe_groups, $userlib, $user, $smarty; @@ -152,7 +147,6 @@ if (!empty($including)) { $groups = $userlib->get_including_groups($including); } - array_walk($groups, 'trim_value'); if (!empty($hidelink_including)) { $privategroups = $userlib->get_including_groups($hidelink_including); $smarty->assign('privategroups', $privategroups); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |