From: <sy...@us...> - 2010-10-28 13:59:53
|
Revision: 30390 http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=30390&view=rev Author: sylvieg Date: 2010-10-28 13:59:46 +0000 (Thu, 28 Oct 2010) Log Message: ----------- [FIX]invit: invit_to_my_groups is for the plugin not the feature + missing update Modified Paths: -------------- branches/6.x/db/tiki.sql branches/6.x/lib/wiki-plugins/wikiplugin_invite.php branches/6.x/tiki-invite.php branches/6.x/tiki-invited.php Added Paths: ----------- branches/6.x/installer/schema/20101028_p_invit_tiki.sql Modified: branches/6.x/db/tiki.sql =================================================================== --- branches/6.x/db/tiki.sql 2010-10-28 13:27:27 UTC (rev 30389) +++ branches/6.x/db/tiki.sql 2010-10-28 13:59:46 UTC (rev 30390) @@ -2911,7 +2911,7 @@ INSERT INTO `users_permissions` (`permName`, `permDesc`, `level`, `type`, `admin`, `feature_check`) VALUES('tiki_p_trust_input', 'Trust all user inputs including plugins (no security checks)', 'admin', 'tiki', NULL, NULL); INSERT INTO `users_permissions` (`permName`, `permDesc`, `level`, `type`, `admin`, `feature_check`) VALUES('tiki_p_view_backlink', 'View page backlinks', 'basic', 'wiki', NULL, 'feature_wiki'); INSERT INTO `users_permissions` (`permName`, `permDesc`, `level`, `type`, `admin`, `feature_check`) VALUES('tiki_p_admin_notifications', 'Can admin mail notifications', 'editors', 'tiki', NULL, NULL); -INSERT INTO `users_permissions` (`permName`, `permDesc`, `level`, `type`, `admin`, `feature_check`) VALUES('tiki_p_invite', 'Can invite user to groups', 'editors', 'tiki', NULL, NULL); +INSERT INTO `users_permissions` (`permName`, `permDesc`, `level`, `type`, `admin`, `feature_check`) VALUES('tiki_p_invite_to_my_groups', 'Can invite user to my groups', 'editors', 'tiki', NULL, NULL); INSERT INTO `users_permissions` (`permName`, `permDesc`, `level`, `type`, `admin`, `feature_check`) VALUES('tiki_p_delete_account', 'Can delete his/her own account', 'admin', 'tiki', NULL, NULL); INSERT INTO `users_permissions` (`permName`, `permDesc`, `level`, `type`, `admin`, `feature_check`) VALUES('tiki_p_admin_importer', 'Can use the importer', 'admin', 'tiki', NULL, NULL); INSERT INTO `users_permissions` (`permName`, `permDesc`, `level`, `type`, `admin`, `feature_check`) VALUES('tiki_p_admin_categories', 'Can admin categories', 'editors', 'category', 'y', 'feature_categories'); @@ -3765,4 +3765,4 @@ KEY `used_on_user` (`used_on_user`) ); -INSERT INTO `users_permissions` (`permName`, `permDesc`, `level`, `type`, `admin`, `feature_check`) VALUES ('tiki_p_invite_to_my_groups', 'Can invite users by email, and include them in groups', 'registered', 'tiki', NULL, 'feature_invite'); +INSERT INTO `users_permissions` (`permName`, `permDesc`, `level`, `type`, `admin`, `feature_check`) VALUES ('tiki_p_invite', 'Can invite users by email, and include them in groups', 'registered', 'tiki', NULL, 'feature_invite'); Added: branches/6.x/installer/schema/20101028_p_invit_tiki.sql =================================================================== --- branches/6.x/installer/schema/20101028_p_invit_tiki.sql (rev 0) +++ branches/6.x/installer/schema/20101028_p_invit_tiki.sql 2010-10-28 13:59:46 UTC (rev 30390) @@ -0,0 +1,9 @@ +UPDATE `tiki_preferences` SET `name`='feature_invite' WHERE `name`='feature_invit'; +UPDATE `users_permissions` SET `permDesc`='Can invite user to my groups', `permName`='tiki_p_invite_to_my_groups' WHERE `permDesc`='Can invite user to groups'; +UPDATE `users_permissions` SET `permName`='tiki_p_invite' WHERE `permDesc`='Can invit users by email, and include them in groups'; +UPDATE `users_objectpermissions` SET `permName`='tiki_p_invite_temp' WHERE `permName`='tiki_p_invite'; +UPDATE `users_objectpermissions` SET `permName`='tiki_p_invite' WHERE `permName`='tiki_p_invite_to_my_groups'; +UPDATE `users_objectpermissions` SET `permName`='tiki_p_invite_to_my_groups' WHERE `permName`='tiki_p_invite_temp'; +UPDATE `users_grouppermissions` SET `permName`='tiki_p_invite_temp' WHERE `permName`='tiki_p_invite'; +UPDATE `users_grouppermissions` SET `permName`='tiki_p_invite' WHERE `permName`='tiki_p_invite_to_my_groups'; +UPDATE `users_grouppermissions` SET `permName`='tiki_p_invite_to_my_groups' WHERE `permName`='tiki_p_invite_temp'; \ No newline at end of file Modified: branches/6.x/lib/wiki-plugins/wikiplugin_invite.php =================================================================== --- branches/6.x/lib/wiki-plugins/wikiplugin_invite.php 2010-10-28 13:27:27 UTC (rev 30389) +++ branches/6.x/lib/wiki-plugins/wikiplugin_invite.php 2010-10-28 13:59:46 UTC (rev 30390) @@ -31,9 +31,9 @@ ); } function wikiplugin_invite( $data, $params) { - global $prefs, $tikilib, $userlib, $user, $smarty, $tiki_p_invite; + global $prefs, $tikilib, $userlib, $user, $smarty, $tiki_p_invite_to_my_groups; - if ($tiki_p_invite != 'y') { + if ($tiki_p_invite_to_my_groups != 'y') { return; } $userGroups = $userlib->get_user_groups_inclusion($user); Modified: branches/6.x/tiki-invite.php =================================================================== --- branches/6.x/tiki-invite.php 2010-10-28 13:27:27 UTC (rev 30389) +++ branches/6.x/tiki-invite.php 2010-10-28 13:59:46 UTC (rev 30390) @@ -1,8 +1,12 @@ <?php - +// (c) Copyright 2002-2010 by authors of the Tiki Wiki/CMS/Groupware Project +// +// All Rights Reserved. See copyright.txt for details and a complete list of authors. +// Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See license.txt for details. +// $Id$ require_once ('tiki-setup.php'); $access->check_feature('feature_invite'); -$access->check_permission('tiki_p_invite_to_my_groups'); +$access->check_permission('tiki_p_invite'); require_once ('lib/webmail/tikimaillib.php'); Modified: branches/6.x/tiki-invited.php =================================================================== --- branches/6.x/tiki-invited.php 2010-10-28 13:27:27 UTC (rev 30389) +++ branches/6.x/tiki-invited.php 2010-10-28 13:59:46 UTC (rev 30390) @@ -1,7 +1,8 @@ <?php require_once ('tiki-setup.php'); -if ($prefs['feature_invite'] != 'y') die("feature_invite not enabled"); +$access->check_feature('feature_invite'); +$access->check_permission('tiki_p_invite'); function tiki_invited() { global $smarty, $tikilib, $prefs, $user, $userlib; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |