+ getField('user_options');
$opts['post_xorg_perms'] = $_POST['post_xorg_perms'];
$cur->setField('user_options', $opts);
}
- public static function behavior_coreBlogGetPosts(&$rs) {
+ public static function behavior_coreBlogGetPosts($rs) {
$rs->extend('xorgPostPermsFilter');
}
-/* public static function behavior_coreBlogGetComments(&$rs) {
+/* public static function behavior_coreBlogGetComments($rs) {
$rs->extends('xorgCommentPermsFilter');
}*/
}
@@ -92,14 +111,14 @@ class xorgPostPermsWidget {
if (class_exists('rsExtPostPublic')) {
class xorgPostPermsFilter extends rsExtPostPublic {
- private static function canRead(&$rs) {
+ private static function canRead($rs) {
$metas = unserialize($rs->field('post_meta'));
global $core;
if (!isset($metas['post_xorg_perms'])) {
return true;
} elseif ($metas['post_xorg_perms'] == 'public') {
return true;
- } elseif ($metas['post_xorg_perms'] == 'auth' && $core->auth->userID()) {
+ } elseif ($metas['post_xorg_perms'] == 'auth' && $core->auth->checkPassword()) {
return true;
} elseif ($metas['post_xorg_perms'] == 'group' && $core->auth->getInfo('xorg_group_member')) {
return true;
@@ -107,22 +126,22 @@ class xorgPostPermsFilter extends rsExtPostPublic {
return false;
}
- private static function showMessage(&$rs) {
+ private static function showMessage($rs) {
$metas = unserialize($rs->field('post_meta'));
global $core;
$str = '
'
- . 'Vous n\'avez pas les droits suffisants pour lire ce billet ';
- if (!$core->auth->userID()) {
- $str .= 'Vous devez vous authentifier';
+ . 'Vous n\'avez pas les droits suffisants pour lire ce billet : ';
+ if (!$core->auth->checkPassword()) {
+ $str .= 'Vous devez vous authentifier';
} else {
$str .= 'Tu dois être membre du groupe pour lire ce message';
}
return $str . '
';
}
- public static function getContent(&$rs, $absolute_urls = false) {
+ public static function getContent($rs, $absolute_urls = false) {
if (self::canRead($rs)) {
- return parent::getContent(&$rs, $absolute_urls);
+ return parent::getContent($rs, $absolute_urls);
} else if (!self::isExtended($rs)) {
return self::showMessage($rs);
} else {
@@ -130,9 +149,9 @@ class xorgPostPermsFilter extends rsExtPostPublic {
}
}
- public static function getExcerpt(&$rs, $absolute_urls = false) {
+ public static function getExcerpt($rs, $absolute_urls = false) {
if (self::canRead($rs)) {
- return parent::getContent(&$rs, $absolute_urls);
+ return parent::getExcerpt($rs, $absolute_urls);
} else if (self::isExtended($rs)) {
return self::showMessage($rs);
} else {
@@ -140,15 +159,15 @@ class xorgPostPermsFilter extends rsExtPostPublic {
}
}
- public static function commentsActive(&$rs) {
+ public static function commentsActive($rs) {
return self::canRead($rs) && parent::commentsActive($rs);
}
- public static function trackbacksActive(&$rs) {
+ public static function trackbacksActive($rs) {
return self::canRead($rs) && parent::trackbacksActive($rs);
}
- public static function hasComments(&$rs) {
+ public static function hasComments($rs) {
return self::canRead($rs) && parent::hasComments($rs);
}
}