[Gemstracker-svn] SF.net SVN: gemstracker:[388] trunk/library/classes/Gems

[<gem...@li...>]

Revision: 388
          http://gemstracker.svn.sourceforge.net/gemstracker/?rev=388&view=rev
Author:   matijsdejong
Date:     2011-12-22 17:07:21 +0000 (Thu, 22 Dec 2011)
Log Message:
-----------
Extra documentation in MenuAbstract.php
ProjectSettings.php %s in salt is not required
UserLoader.php $currentUser is not always initialized.

Modified Paths:
--------------
    trunk/library/classes/Gems/Menu/MenuAbstract.php
    trunk/library/classes/Gems/Project/ProjectSettings.php
    trunk/library/classes/Gems/User/UserLoader.php

Modified: trunk/library/classes/Gems/Menu/MenuAbstract.php
===================================================================
--- trunk/library/classes/Gems/Menu/MenuAbstract.php	2011-12-22 15:41:40 UTC (rev 387)
+++ trunk/library/classes/Gems/Menu/MenuAbstract.php	2011-12-22 17:07:21 UTC (rev 388)
@@ -263,8 +263,8 @@
     /**
      * Add a page to the menu
      *
-     * @param string $label         The label to display for the menu item
-     * @param string $privilege     The privilege for the item
+     * @param string $label         The label to display for the menu item, null for access without display
+     * @param string $privilege     The privilege for the item, null is always, 'pr.islogin' must be logged in, 'pr.nologin' only when not logged in.
      * @param string $controller    What controller to use
      * @param string $action        The name of the action
      * @param array  $other         Array of extra options for this item, e.g. 'visible', 'allowed', 'class', 'icon', 'target', 'type', 'button_only'

Modified: trunk/library/classes/Gems/Project/ProjectSettings.php
===================================================================
--- trunk/library/classes/Gems/Project/ProjectSettings.php	2011-12-22 15:41:40 UTC (rev 387)
+++ trunk/library/classes/Gems/Project/ProjectSettings.php	2011-12-22 17:07:21 UTC (rev 388)
@@ -166,10 +166,6 @@
             throw new Gems_Exception_Coding($error);
         }
 
-        if (strpos($this->offsetGet('salt'), '%s') === false) {
-            throw new Gems_Exception_Coding("Required project setting 'salt' must contain '%s'.");
-        }
-
         $superPassword = $this->getSuperAdminPassword();
         if ((APPLICATION_ENV === 'production') && $this->getSuperAdminName() && $superPassword) {
             if (strlen($superPassword) < $this->minimumSuperPasswordLength) {

Modified: trunk/library/classes/Gems/User/UserLoader.php
===================================================================
--- trunk/library/classes/Gems/User/UserLoader.php	2011-12-22 15:41:40 UTC (rev 387)
+++ trunk/library/classes/Gems/User/UserLoader.php	2011-12-22 17:07:21 UTC (rev 388)
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Copyright (c) 2011, Erasmus MC
  * All rights reserved.
@@ -155,7 +156,7 @@
             self::USER_STAFF => $this->translate->_('Db storage'),
             'RadiusUser'     => $this->translate->_('Radius storage')
         );
-        
+
         return $definitions;
     }
 
@@ -191,7 +192,7 @@
         static $organizations = array();
 
         if (null === $organizationId) {
-            $organizationId = intval(self::$currentUser->getCurrentOrganizationId());
+            $organizationId = intval(self::getCurrentUser()->getCurrentOrganizationId());
         }
 
         if (! isset($organizations[$organizationId])) {

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