'nom' => null,
'grpauth' => null,
'perms' => null);
- static public function behavior_coreBlogConstruct(&$blog) {
+ static public function behavior_coreBlogConstruct($blog) {
global $core;
$core->auth->sudo(array($core->auth, 'updateUserPerms'), $blog);
}
- public function __construct(&$core) {
+ public function __construct($core) {
parent::__construct($core);
$core->addBehavior('coreBlogConstruct', array('xorgAuth', 'behavior_coreBlogConstruct'));
}
$this->user_id = $user;
$this->user_admin = ($_SESSION['auth-xorg-perms'] == 'admin');
parent::checkUser($this->user_id);
- $core->getUserBlogs();
+// $core->getUserBlogs();
$this->setCommentCookie();
}
}
}
}
- public function updateUserPerms(&$blog) {
+ public function updateUserPerms($blog) {
global $core;
$this->buildFromSession();
if (!isset($_SESSION['auth-xorg'])) {
return;
}
- $type = $blog->settings->get('xorg_blog_type');
- $owner = $blog->settings->get('xorg_blog_owner');
+ $type = $blog->settings->xorgauth->get('xorg_blog_type');
+ $owner = $blog->settings->xorgauth->get('xorg_blog_owner');
$level = $this->xorg_infos['grpauth'];
$rec = $core->getUser($this->user_id);
$wasAdmin = $rec->f('user_super');
$this->killSession();
return;
}
- if (($type == 'group-admin' || $type == 'group-member') && $level == 'admin') {
+ if (($type == 'group-admin' || $type == 'group-member' || $type == 'connected') && $level == 'admin') {
$perms = array('usage' => true,
'contentadmin' => true,
'admin' => true);
} else if ($type == 'group-member' && $level == 'membre') {
$perms = array('usage' => true);
+ } else if ($type == 'connected' && $this->xorg_infos['forlife'] != '') {
+ $perms = array('usage' => true);
} else if ($type == 'user' && $owner == $this->xorg_infos['forlife']) {
$perms = array('usage' => true,
'contentadmin' => true,
$path = @$_SERVER['PATH_INFO'];
}
$_SESSION["auth-x-challenge"] = md5(uniqid(rand(), 1));
- $_SESSION['xorg-group'] = $core->blog->settings->get('xorg_blog_owner');
+ $_SESSION['xorg-group'] = $core->blog->settings->xorgauth->get('xorg_blog_owner');
$url = "https://www.polytechnique.org/auth-groupex/utf8";
$url .= "?session=" . session_id();
$url .= "&challenge=" . $_SESSION["auth-x-challenge"];
$url .= "&pass=" . md5($_SESSION["auth-x-challenge"] . XORG_AUTH_KEY);
- $type = $core->blog->settings->get('xorg_blog_type');
- if ($type == 'group-member' || $type == 'group-admin') {
- $url .= '&group=' . $core->blog->settings->get('xorg_blog_owner');
+ $type = $core->blog->settings->xorgauth->get('xorg_blog_type');
+ if ($type == 'group-member' || $type == 'group-admin' || $type == 'connected') {
+ $url .= '&group=' . $core->blog->settings->xorgauth->get('xorg_blog_owner');
}
$url .= "&url=" . urlencode($core->blog->url . "auth/XorgReturn?path=" . $path);
session_write_close();
public function userID() {
$this->buildFromSession();
-// $isadmin = preg_match('@/admin/[^/]+\.php$@i', $_SERVER['SCRIPT_FILENAME']);
-// if (!$isadmin) {
-// return null;
-// }
+ $isadmin = preg_match('@/admin/[^/]+\.php$@i', $_SERVER['SCRIPT_FILENAME']);
+ if (!$isadmin) {
+ return null;
+ }
return parent::userID();
}
- public function getPermissions() {
+ public function getPermissions($blog_id) {
$this->buildFromSession();
- return parent::getPermissions();
+ return parent::getPermissions($blog_id);
}
public function getInfo($n) {
$this->buildFromSession();
if ($n == 'xorg_group_member') {
global $core;
- if ($core->blog->settings->get('xorg_blog_owner') != $_SESSION['xorg-group']) {
+ if ($core->blog->settings->xorgauth->get('xorg_blog_owner') != $_SESSION['xorg-group']) {
return false;
}
$perm = $this->xorg_infos['grpauth'];