[Sciret-svn] SF.net SVN: sciret: [600] branches/release-candidates/sciret-1.2

[<al...@us...>]

Revision: 600
          http://sciret.svn.sourceforge.net/sciret/?rev=600&view=rev
Author:   alpeb
Date:     2008-07-07 20:34:28 -0700 (Mon, 07 Jul 2008)

Log Message:
-----------
use class constants instead of global constants

Modified Paths:
--------------
    branches/release-candidates/sciret-1.2/classes/Controller.php
    branches/release-candidates/sciret-1.2/views/EditArticle.php
    branches/release-candidates/sciret-1.2/views/EditPreferences.php
    branches/release-candidates/sciret-1.2/views/ManageUsers.php
    branches/release-candidates/sciret-1.2/views/ViewArticle.php

Modified: branches/release-candidates/sciret-1.2/classes/Controller.php
===================================================================
--- branches/release-candidates/sciret-1.2/classes/Controller.php	2008-07-08 03:33:32 UTC (rev 599)
+++ branches/release-candidates/sciret-1.2/classes/Controller.php	2008-07-08 03:34:28 UTC (rev 600)
@@ -59,7 +59,7 @@
                (($this->user->getRole() & $this->views[$view][MINIMUM_ROLE]) != $this->views[$view][MINIMUM_ROLE])
 
                // or user is anonymous and KB is not public
-               || ($this->user->getRole() == ROLE_ANONYMOUS && $this->views[$view][ALLOW_VIEW_ONLY_IF_PUBLIC_KB] && !$this->configuration->getConfigValue('publishKB'))
+               || ($this->user->getRole() == User::ROLE_ANONYMOUS && $this->views[$view][ALLOW_VIEW_ONLY_IF_PUBLIC_KB] && !$this->configuration->getConfigValue('publishKB'))
            )
         {
             Library::redirect(Library::getLink(array('view' => 'Login')));

Modified: branches/release-candidates/sciret-1.2/views/EditArticle.php
===================================================================
--- branches/release-candidates/sciret-1.2/views/EditArticle.php	2008-07-08 03:33:32 UTC (rev 599)
+++ branches/release-candidates/sciret-1.2/views/EditArticle.php	2008-07-08 03:34:28 UTC (rev 600)
@@ -67,7 +67,7 @@
 
             $this->tpl->parse('article_id', 'article_id_block');
 
-            if (($this->user->getRole() & ROLE_ADMIN) == ROLE_ADMIN) {
+            if (($this->user->getRole() & User::ROLE_ADMIN) == User::ROLE_ADMIN) {
                 $this->tpl->set_var(array(  
             ));
                 $this->tpl->parse('usage_id','usage_block');

Modified: branches/release-candidates/sciret-1.2/views/EditPreferences.php
===================================================================
--- branches/release-candidates/sciret-1.2/views/EditPreferences.php	2008-07-08 03:33:32 UTC (rev 599)
+++ branches/release-candidates/sciret-1.2/views/EditPreferences.php	2008-07-08 03:34:28 UTC (rev 600)
@@ -81,7 +81,7 @@
         }
 
         // *** ADMIN PREFERENCES ***
-        if (($this->user->getRole() & ROLE_ADMIN) == ROLE_ADMIN) {
+        if (($this->user->getRole() & User::ROLE_ADMIN) == User::ROLE_ADMIN) {
             $this->tpl->set_var(array(  
             ));
             $this->tpl->parse('adminPreferences', 'adminPreferences_block');

Modified: branches/release-candidates/sciret-1.2/views/ManageUsers.php
===================================================================
--- branches/release-candidates/sciret-1.2/views/ManageUsers.php	2008-07-08 03:33:32 UTC (rev 599)
+++ branches/release-candidates/sciret-1.2/views/ManageUsers.php	2008-07-08 03:34:28 UTC (rev 600)
@@ -36,7 +36,7 @@
                 'userId'        => $user->getId(),
                 'userName'      => $user->getUserName(),
                 'email'         => $user->getEmail(),
-                'adminRights'   => $user->getRole() == ROLE_ADMIN? $this->user->lang('Yes') : $this->user->lang('No'),
+                'adminRights'   => $user->getRole() == User::ROLE_ADMIN? $this->user->lang('Yes') : $this->user->lang('No'),
             ));
             if ($user->getId() != 1) {
                 $this->tpl->parse('delete', 'delete_block');

Modified: branches/release-candidates/sciret-1.2/views/ViewArticle.php
===================================================================
--- branches/release-candidates/sciret-1.2/views/ViewArticle.php	2008-07-08 03:33:32 UTC (rev 599)
+++ branches/release-candidates/sciret-1.2/views/ViewArticle.php	2008-07-08 03:34:28 UTC (rev 600)
@@ -200,7 +200,7 @@
         $showEditDelete = false;
 
         if ($this->configuration->getConfigValue('restrictEditDelete')) {
-            if ($this->article->getUserId() == $this->user->getId() || ($this->user->getRole() & ROLE_ADMIN) == ROLE_ADMIN) {
+            if ($this->article->getUserId() == $this->user->getId() || ($this->user->getRole() & User::ROLE_ADMIN) == User::ROLE_ADMIN) {
                 $showEditDelete = true;
             }
         } else {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.