X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=widget.post.perms.php;h=0c9615a6b478712c5103101736718189c225f229;hb=refs%2Fheads%2Fmaster;hp=de2192c3d055f01b7458eb8707482fc9904af9d9;hpb=9921376e6fd56658f9c4edb89dce685fba9ba1a5;p=dotclear.git

diff --git a/widget.post.perms.php b/widget.post.perms.php
index de2192c..0c9615a 100644
--- a/widget.post.perms.php
+++ b/widget.post.perms.php
@@ -42,7 +42,7 @@ class xorgPostPermsWidget {
     <?php
   }
 
-  private static function setPermsMeta(&$cur) {
+  private static function setPermsMeta($cur) {
     $meta = $cur->getField('post_meta');
     if (is_string($meta)) {
       $meta = unserialize($meta);
@@ -54,11 +54,11 @@ class xorgPostPermsWidget {
     $cur->setField('post_meta', serialize($meta));
   }
 
-  public static function behavior_adminBeforePostCreate(&$cur) {
+  public static function behavior_adminBeforePostCreate($cur) {
     self::setPermsMeta($cur);
   }
 
-  public static function behavior_adminBeforePostUpdate(&$cur, $post_id) {
+  public static function behavior_adminBeforePostUpdate($cur, $post_id) {
     self::setPermsMeta($cur);
   }
 
@@ -93,17 +93,17 @@ class xorgPostPermsWidget {
     <?php
   }
 
-  public static function behavior_adminBeforeUserUpdate(&$cur, $user_id) {
+  public static function behavior_adminBeforeUserUpdate($cur, $user_id) {
     $opts = $cur->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');
   }*/
 }
@@ -111,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;
@@ -126,12 +126,12 @@ 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 = '<p class="error">'
-         . 'Vous n\'avez pas les droits suffisants pour lire ce billet<br />';
-    if (!$core->auth->userID()) {
+         . 'Vous n\'avez pas les droits suffisants pour lire ce billet&nbsp;:<br />';
+    if (!$core->auth->checkPassword()) {
       $str .= 'Vous devez vous <a href="' . $core->blog->url . 'auth/Xorg?path=' . $_SERVER['PATH_INFO'] .'">authentifier</a>';
     } else {
       $str .= 'Tu dois être membre du groupe pour lire ce message';
@@ -141,7 +141,7 @@ class xorgPostPermsFilter extends rsExtPostPublic {
 
   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 {
@@ -151,7 +151,7 @@ class xorgPostPermsFilter extends rsExtPostPublic {
 
   public static function getExcerpt($rs, $absolute_urls = false) {
     if (self::canRead($rs)) {
-      return parent::getExcerpt(&$rs, $absolute_urls);
+      return parent::getExcerpt($rs, $absolute_urls);
     } else if (self::isExtended($rs)) {
       return self::showMessage($rs);
     } else {