From 9921376e6fd56658f9c4edb89dce685fba9ba1a5 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Rapha=C3=ABl=20Barrois?= Date: Fri, 15 Jan 2010 19:19:27 +0100 Subject: [PATCH] Adapt to dotclear 2.1.6 MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit * new way of accessing settings * new protoype for a few functions * remove getUserBlogs() Signed-off-by: Raphaël Barrois --- class.xorg.auth.php | 18 +++++++++--------- page.webservice.php | 3 +-- widget.blog.owner.php | 9 ++++----- widget.copyright.php | 4 ++-- widget.post.perms.php | 12 ++++++------ 5 files changed, 22 insertions(+), 24 deletions(-) diff --git a/class.xorg.auth.php b/class.xorg.auth.php index 2ae8852..acdb277 100644 --- a/class.xorg.auth.php +++ b/class.xorg.auth.php @@ -38,7 +38,7 @@ class xorgAuth extends dcAuth { $this->user_id = $user; $this->user_admin = ($_SESSION['auth-xorg-perms'] == 'admin'); parent::checkUser($this->user_id); - $core->getUserBlogs(); +// $core->getUserBlogs(); $this->setCommentCookie(); } } @@ -80,8 +80,8 @@ class xorgAuth extends dcAuth { 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'); @@ -131,14 +131,14 @@ class xorgAuth extends dcAuth { $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'); + $type = $core->blog->settings->xorgauth->get('xorg_blog_type'); if ($type == 'group-member' || $type == 'group-admin') { - $url .= '&group=' . $core->blog->settings->get('xorg_blog_owner'); + $url .= '&group=' . $core->blog->settings->xorgauth->get('xorg_blog_owner'); } $url .= "&url=" . urlencode($core->blog->url . "auth/XorgReturn?path=" . $path); session_write_close(); @@ -231,16 +231,16 @@ class xorgAuth extends dcAuth { 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']; diff --git a/page.webservice.php b/page.webservice.php index b19cfbf..2492c16 100644 --- a/page.webservice.php +++ b/page.webservice.php @@ -71,8 +71,7 @@ class XorgWebservice extends dcUrlHandlers { xorgBlogOwnerWidget::setXorgOwner($settings, $type, $owner); $settings = new dcSettings($core, $owner); - $settings->setNamespace('system'); - $settings->put('public_path', 'public/' . $owner); + $settings->system->put('public_path', 'public/' . $owner); return array('status' => true, 'message' => 'blog created'); diff --git a/widget.blog.owner.php b/widget.blog.owner.php index 7cf24f4..fec3393 100644 --- a/widget.blog.owner.php +++ b/widget.blog.owner.php @@ -14,7 +14,7 @@ class xorgBlogOwnerWidget { 'selected' => false), 'group-admin' => array('text' => 'Blog de groupe, édition par les administrateurs', 'selected' => false)); - $type = $settings->get('xorg_blog_type'); + $type = $settings->xorgauth->get('xorg_blog_type'); if (!$type) { $type = 'user'; } @@ -42,7 +42,7 @@ class xorgBlogOwnerWidget {

@@ -65,9 +65,8 @@ class xorgBlogOwnerWidget { public static function setXorgOwner(&$settings, $type, $owner) { global $core; if ($core->auth->isSuperAdmin()) { - $settings->setNamespace('xorgauth'); - $settings->put('xorg_blog_type', $type, 'string', 'Type de blog X.org'); - $settings->put('xorg_blog_owner', $owner, 'string', 'Propriétaire X.org du blog'); + $settings->xorgauth->put('xorg_blog_type', $type, 'string', 'Type de blog X.org'); + $settings->xorgauth->put('xorg_blog_owner', $owner, 'string', 'Propriétaire X.org du blog'); } } diff --git a/widget.copyright.php b/widget.copyright.php index 1cf240d..11e78d8 100644 --- a/widget.copyright.php +++ b/widget.copyright.php @@ -6,8 +6,8 @@ class xorgCopyrightWidget { static public function widget(&$w) { global $core; - $copyright = $core->blog->settings->get('copyright_notice'); - $editor = $core->blog->settings->get('editor'); + $copyright = $core->blog->settings->system->get('copyright_notice'); + $editor = $core->blog->settings->system->get('editor'); $text = '

Mentions légales

    '; if ($editor) { diff --git a/widget.post.perms.php b/widget.post.perms.php index d3b74d7..de2192c 100644 --- a/widget.post.perms.php +++ b/widget.post.perms.php @@ -8,7 +8,7 @@ class xorgPostPermsWidget { 'selected' => false)); $pos = 'public'; global $core; - $type = $core->blog->settings->get('xorg_blog_type'); + $type = $core->blog->settings->xorgauth->get('xorg_blog_type'); if ($type == 'group-admin' || $type == 'group-member') { $choices['group'] = array('text' => 'Visible par les membres du groupe', 'selected' => false); @@ -139,7 +139,7 @@ class xorgPostPermsFilter extends rsExtPostPublic { 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); } else if (!self::isExtended($rs)) { @@ -149,7 +149,7 @@ 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::getExcerpt(&$rs, $absolute_urls); } else if (self::isExtended($rs)) { @@ -159,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); } } -- 2.1.4