http://www.mediawiki.org/wiki/Special:Code/MediaWiki/88710
Revision: 88710
Author: werdna
Date: 2011-05-24 02:14:14 +0000 (Tue, 24 May 2011)
Log Message:
-----------
Merge whitelist options
Modified Paths:
--------------
trunk/extensions/SemanticACL/SemanticACL.php
Modified: trunk/extensions/SemanticACL/SemanticACL.php
===================================================================
--- trunk/extensions/SemanticACL/SemanticACL.php 2011-05-24 01:57:30 UTC
(rev 88709)
+++ trunk/extensions/SemanticACL/SemanticACL.php 2011-05-24 02:14:14 UTC
(rev 88710)
@@ -81,40 +81,33 @@
$result = false;
return false;
}
- } elseif ( $value == 'whitelist group' ) {
- $whitelistProperty = new SMWDIProperty(
"{$prefix}_WL_GROUP" );
- $whitelistValues = $store->getPropertyValues( $subject,
$whitelistProperty );
+ } elseif ( $value == 'whitelist' ) {
+ $isWhitelisted = false;
- $inWhitelistedGroup = false;
+ $groupProperty = new SMWDIProperty(
"{$prefix}_WL_GROUP" );
+ $userProperty = new SMWDIProperty( "{$prefix}_WL_USER"
);
+ $whitelistValues = $store->getPropertyValues( $subject,
$groupProperty );
foreach( $whitelistValues as $whitelistValue ) {
$group =
strtolower($whitelistValue->getString());
if ( in_array( $group,
$user->getEffectiveGroups() ) ) {
- $inWhitelistedGroup = true;
+ $isWhitelisted = true;
break;
}
}
- if ( ! $inWhitelistedGroup ) {
- $result = false;
- return false;
- }
- } elseif ( $value == 'whitelist user' ) {
- $whitelistProperty = new SMWDIProperty(
"{$prefix}_WL_USER" );
- $whitelistValues = $store->getPropertyValues( $subject,
$whitelistProperty );
+ $whitelistValues = $store->getPropertyValues( $subject,
$userProperty );
- $isWhitelistedUser = false;
-
foreach( $whitelistValues as $whitelistValue ) {
$title = $whitelistValue->getTitle();
if ( $title->equals( $user->getUserPage() ) ) {
- $isWhitelistedUser = true;
+ $isWhitelisted = true;
}
}
- if ( ! $isWhitelistedUser ) {
+ if ( ! $isWhitelisted ) {
$result = false;
return false;
}
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
