[Gemstracker-svn] SF.net SVN: gemstracker:[198] branches/newUser2

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

Revision: 198
          http://gemstracker.svn.sourceforge.net/gemstracker/?rev=198&view=rev
Author:   matijsdejong
Date:     2011-11-10 15:29:54 +0000 (Thu, 10 Nov 2011)
Log Message:
-----------
Small bug fixes for #31

Modified Paths:
--------------
    branches/newUser2/classes/Gems/Default/StaffAction.php
    branches/newUser2/classes/Gems/Project/ProjectSettings.php
    branches/newUser2/classes/Gems/User/User.php
    branches/newUser2/classes/Gems/User/UserLoader.php
    branches/newUser2/configs/db/patches.sql

Modified: branches/newUser2/classes/Gems/Default/StaffAction.php
===================================================================
--- branches/newUser2/classes/Gems/Default/StaffAction.php	2011-11-09 12:18:27 UTC (rev 197)
+++ branches/newUser2/classes/Gems/Default/StaffAction.php	2011-11-10 15:29:54 UTC (rev 198)
@@ -98,7 +98,7 @@
             case Gems_User_UserLoader::USER_STAFF:
                 Gems_Model::addUserPassword($model);
                 $passwordField = 'gup_password';
-                $model->setOnSave($passwordField, array($this->project, 'getValueHash'));
+                $model->setOnSave($passwordField, array($this->project, 'getValueHashForModel'));
                 break;
 
             case Gems_User_UserLoader::USER_OLD_STAFF:

Modified: branches/newUser2/classes/Gems/Project/ProjectSettings.php
===================================================================
--- branches/newUser2/classes/Gems/Project/ProjectSettings.php	2011-11-09 12:18:27 UTC (rev 197)
+++ branches/newUser2/classes/Gems/Project/ProjectSettings.php	2011-11-10 15:29:54 UTC (rev 198)
@@ -206,9 +206,26 @@
         $salt = $this->offsetExists('salt') ? $this->offsetGet('salt') : '';
 
         if (false === strpos($salt, '%s')) {
-            return md5($salt . $value, false);
+            $salted = $salt . $value;
         } else {
-            return md5(sprintf($salt, $value), false);
+            $salted = sprintf($salt, $value);
         }
+
+        // MUtil_Echo::track($value, md5($salted));
+
+        return md5($salted, false);
     }
+
+    /**
+     * Returns a salted hash on the
+     *
+     * @param string $name Fieldname
+     * @param string $value The value to hash
+     * @param string $isNew True when new
+     * @return string The salted hash as a 32-character hexadecimal number.
+     */
+    public function getValueHashForModel($name, $value, $isNew = false)
+    {
+        return $this->getValueHash($value);
+    }
 }

Modified: branches/newUser2/classes/Gems/User/User.php
===================================================================
--- branches/newUser2/classes/Gems/User/User.php	2011-11-09 12:18:27 UTC (rev 197)
+++ branches/newUser2/classes/Gems/User/User.php	2011-11-10 15:29:54 UTC (rev 198)
@@ -202,6 +202,16 @@
     }
 
     /**
+     * Returns the group number of the current user.
+     * 
+     * @return int
+     */
+    public function getGroup()
+    {
+        return $this->_getVar('user_group');
+    }
+
+    /**
      * The locale set for this user..
      *
      * @return string

Modified: branches/newUser2/classes/Gems/User/UserLoader.php
===================================================================
--- branches/newUser2/classes/Gems/User/UserLoader.php	2011-11-09 12:18:27 UTC (rev 197)
+++ branches/newUser2/classes/Gems/User/UserLoader.php	2011-11-10 15:29:54 UTC (rev 198)
@@ -102,6 +102,7 @@
      */
     public final function checkPassword($login_name, $organization, $password)
     {
+        // MUtil_Echo::track($login_name, $organization, $password);
         $success = $this->checkPasswordValidity($login_name, $organization, $password);
 
         try {
@@ -152,7 +153,7 @@
 
         } catch (Zend_Db_Exception $e) {
             // Fall through as this does not work if the database upgrade did not run
-            MUtil_Echo::r($e);
+            // MUtil_Echo::r($e);
         }
         return $success;
     }
@@ -185,6 +186,8 @@
 
                 $db_pwd = $this->db->fetchOne($sql, array($login_name, $organization));
 
+                // MUtil_Echo::track($password, $pwd_hash, $db_pwd);
+
                 return ($pwd_hash == $db_pwd);
 
             case self::USER_OLD_STAFF:

Modified: branches/newUser2/configs/db/patches.sql
===================================================================
--- branches/newUser2/configs/db/patches.sql	2011-11-09 12:18:27 UTC (rev 197)
+++ branches/newUser2/configs/db/patches.sql	2011-11-10 15:29:54 UTC (rev 198)
@@ -285,7 +285,10 @@
     SELECT gsf_login, gsf_id_organization, 'OldStaffUser',
                 gsf_active,
                 gsf_changed, gsf_changed_by, gsf_created, gsf_created_by
-        FROM gems__staff WHERE (gsf_login, gsf_id_organization) NOT IN (SELECT gul_login, gul_id_organization FROM gems__user_logins);
+        FROM gems__staff WHERE gsf_login IS NOT NULL AND
+            gsf_id_organization IS NOT NULL AND
+            gsf_id_organization != 0 AND
+            (gsf_login, gsf_id_organization) NOT IN (SELECT gul_login, gul_id_organization FROM gems__user_logins);
 
 ALTER TABLE `gems__staff` CHANGE `gsf_id_user` `gsf_id_user` BIGINT( 20 ) UNSIGNED NOT NULL;
 
@@ -295,6 +298,12 @@
 
 ALTER TABLE gems__organizations ADD gor_style varchar(15) CHARACTER SET 'utf8' COLLATE 'utf8_general_ci' not null default 'gems' AFTER gor_signature;
 
+INSERT INTO gems__user_ids (gui_id_user, gui_created)
+    SELECT gsf_id_user, gsf_created FROM gems__staff WHERE gsf_id_user NOT IN (SELECT gui_id_user FROM gems__user_ids);
+
+INSERT INTO gems__user_ids (gui_id_user, gui_created)
+    SELECT grs_id_user, grs_created FROM gems__respondents WHERE grs_id_user NOT IN (SELECT gui_id_user FROM gems__user_ids);
+
 -- PATCH: Extra information for track fields
 ALTER TABLE gems__track_fields ADD gtf_field_code varchar(20) CHARACTER SET 'utf8' COLLATE 'utf8_general_ci' null AFTER gtf_field_name,
     ADD gtf_field_description varchar(200) CHARACTER SET 'utf8' COLLATE 'utf8_general_ci' null AFTER gtf_field_code,

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